public/mailtrain
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #174 from witzig/patches-2

Browse source 
Fixed some translation tags
This commit is contained in:
Andris Reinman 2017-03-11 15:37:03 +02:00 • committed by GitHub
commit cf03039268
5 changed files with 30 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

2
views/campaigns/create-triggered.hbs
View file

@ -56,7 +56,7 @@
<div class="col-sm-10">
<p class="form-control-static">
Select a template:
{{#translate}}Select a template:{{/translate}}
</p>
<div>
<select class="form-control" id="template" name="template">

2
views/campaigns/edit-triggered.hbs
View file

@ -84,7 +84,7 @@
<div class="form-group">
<label for="from" class="col-sm-2 control-label">{{#translate}}Email "from name"{{/translate}}</label>
<div class="col-sm-10">
<input type="text" class="form-control" name="from" id="from" value="{{from}}" placeholder="T{{#translate}}his is the name your emails will come from{{/translate}}" required>
<input type="text" class="form-control" name="from" id="from" value="{{from}}" placeholder="{{#translate}}This is the name your emails will come from{{/translate}}" required>
</div>
</div>
<div class="form-group">

10
views/mosaico/editor.hbs
View file

@ -34,16 +34,6 @@
padding: 5px 10px 5px 0;
height: 2em;
}
@media screen and (max-width: 1175px) {
a.ui-button[title='Download template'] {
display: none !important;
}
}
@media screen and (max-width: 1020px) {
#btnMergeReference {
display: none !important;
}
}
</style>

9
views/settings.hbs
View file

@ -119,6 +119,7 @@
<label for="default-homepage" class="col-sm-2 control-label">{{#translate}}Default homepage (URL){{/translate}}</label>
<div class="col-sm-10">
<input type="url" class="form-control" name="default-homepage" id="default-homepage" value="{{defaultHomepage}}" placeholder="{{#translate}}URL to redirect the subscribed users to, eg. http://example.com/{{/translate}}">
<span class="help-block">&nbsp;</span>
</div>
</div>
@ -287,7 +288,7 @@
<div class="form-group">
<label for="smtp-max-connections" class="col-sm-2 control-label">{{#translate}}Max connections{{/translate}}</label>
<div class="col-sm-6">
<div class="col-sm-10">
<input type="number" class="form-control" name="smtp-max-connections" id="smtp-max-connections" placeholder="{{#translate}}The count of max connections, eg. 10{{/translate}}" value="{{smtpMaxConnections}}">
<span class="help-block">{{#translate}}The count of maximum simultaneous connections to make against the SMTP server (defaults to 5). This limit is per sending process.{{/translate}}</span>
</div>
@ -295,15 +296,15 @@
<div class="form-group">
<label for="smtp-max-messages" class="col-sm-2 control-label">{{#translate}}Max messages{{/translate}}</label>
<div class="col-sm-6">
<div class="col-sm-10">
<input type="number" class="form-control" name="smtp-max-messages" id="smtp-max-messages" placeholder="{{#translate}}The count of max messages, eg. 100{{/translate}}" value="{{smtpMaxMessages}}">
<span class="help-block">T{{#translate}}he number of messages to send through a single connection before the connection is closed and reopened (defaults to 100){{/translate}}</span>
<span class="help-block">{{#translate}}The number of messages to send through a single connection before the connection is closed and reopened (defaults to 100){{/translate}}</span>
</div>
</div>
<div class="form-group">
<label for="smtp-throttling" class="col-sm-2 control-label">{{#translate}}Throttling{{/translate}}</label>
<div class="col-sm-6">
<div class="col-sm-10">
<input type="number" class="form-control" name="smtp-throttling" id="smtp-throttling" placeholder="{{#translate}}Messages per hour eg. 1000{{/translate}}" value="{{smtpThrottling}}">
<span class="help-block">{{#translate}}Maximum number of messages to send in an hour. Leave empty or zero for no throttling. If your provider uses a different speed limit (messages/minute or messages/second) then convert this limit into messages/hour (1m/s => 3600m/h). This limit is per sending process.{{/translate}}</span>
</div>