From 30b7ce263f2f4e93d3c0e34676954526d93dfce0 Mon Sep 17 00:00:00 2001 From: RainLoop Team Date: Sat, 21 Mar 2015 00:23:41 +0400 Subject: [PATCH] i18n optimizations --- dev/Common/Translator.js | 38 +++++----- dev/View/Popup/Contacts.js | 8 +- .../app/templates/Views/Admin/AdminMenu.html | 4 +- .../Common/PopupsKeyboardShortcutsHelp.html | 74 +++++++++---------- .../Views/Common/PopupsLanguages.html | 2 +- .../templates/Views/Components/Checkbox.html | 2 +- .../Views/Components/CheckboxClassic.html | 2 +- .../Components/CheckboxMaterialDesign.html | 2 +- .../app/templates/Views/Components/Input.html | 6 +- .../app/templates/Views/Components/Radio.html | 2 +- .../templates/Views/Components/Select.html | 4 +- .../templates/Views/Components/TextArea.html | 4 +- .../0.0.0/app/templates/Views/User/Login.html | 19 ++--- .../templates/Views/User/MailMessageList.html | 28 +++---- .../templates/Views/User/MailMessageView.html | 56 +++++++------- .../app/templates/Views/User/PhotoSwipe.html | 10 +-- .../templates/Views/User/PopupsAccount.html | 12 +-- .../Views/User/PopupsAddOpenPgpKey.html | 4 +- .../Views/User/PopupsAdvancedSearch.html | 28 +++---- .../templates/Views/User/PopupsCompose.html | 40 +++++----- .../Views/User/PopupsComposeOpenPgp.html | 10 +-- .../templates/Views/User/PopupsContacts.html | 50 ++++++------- .../templates/Views/User/PopupsFilter.html | 25 ++++--- .../Views/User/PopupsFolderClear.html | 10 +-- .../Views/User/PopupsFolderCreate.html | 8 +- .../Views/User/PopupsFolderSystem.html | 12 +-- .../templates/Views/User/PopupsIdentity.html | 22 +++--- .../Views/User/PopupsNewOpenPgpKey.html | 12 +-- .../templates/Views/User/PopupsTemplate.html | 10 +-- .../Views/User/PopupsTwoFactorTest.html | 6 +- .../Views/User/PopupsViewOpenPgpKey.html | 6 +- .../Views/User/PopupsWindowSimpleMessage.html | 16 ++-- .../Views/User/SettingsAccounts.html | 14 ++-- .../Views/User/SettingsChangePassword.html | 10 +-- .../Views/User/SettingsContacts.html | 10 +-- .../templates/Views/User/SettingsFilters.html | 12 +-- .../User/SettingsFiltersActionForward.html | 4 +- .../User/SettingsFiltersActionReject.html | 2 +- .../User/SettingsFiltersActionVacation.html | 6 +- .../Views/User/SettingsFolderItem.html | 2 +- .../templates/Views/User/SettingsFolders.html | 10 +-- .../templates/Views/User/SettingsGeneral.html | 14 ++-- .../templates/Views/User/SettingsMenu.html | 4 +- .../templates/Views/User/SettingsOpenPGP.html | 14 ++-- .../templates/Views/User/SettingsPane.html | 2 +- .../Views/User/SettingsSecurity.html | 26 +++---- .../templates/Views/User/SettingsSocial.html | 24 +++--- .../Views/User/SettingsTemplates.html | 6 +- .../templates/Views/User/SettingsThemes.html | 6 +- .../templates/Views/User/SystemDropDown.html | 8 +- 50 files changed, 353 insertions(+), 353 deletions(-) diff --git a/dev/Common/Translator.js b/dev/Common/Translator.js index cb64166c4..c63e6a741 100644 --- a/dev/Common/Translator.js +++ b/dev/Common/Translator.js @@ -66,29 +66,27 @@ $oEl = $(oElement) ; - sKey = $oEl.data('i18n-text'); + sKey = $oEl.data('i18n'); if (sKey) { - $oEl.text(this.i18n(sKey)); - } - else - { - sKey = $oEl.data('i18n-html'); - if (sKey) + if ('[' === sKey.substr(0, 1)) { - $oEl.html(this.i18n(sKey)); + switch (sKey.substr(0, 6)) + { + case '[html]': + $oEl.html(this.i18n(sKey.substr(6))); + break; + case '[place': + $oEl.attr('placeholder', this.i18n(sKey.substr(13))); + break; + case '[title': + $oEl.attr('title', this.i18n(sKey.substr(7))); + break; + } } - - sKey = $oEl.data('i18n-placeholder'); - if (sKey) + else { - $oEl.attr('placeholder', this.i18n(sKey)); - } - - sKey = $oEl.data('i18n-title'); - if (sKey) - { - $oEl.attr('title', this.i18n(sKey)); + $oEl.text(this.i18n(sKey)); } } }; @@ -102,13 +100,13 @@ var self = this; _.defer(function () { - $('.i18n', oElements).each(function () { + $('[data-i18n]', oElements).each(function () { self.i18nToNode(this); }); if (bAnimate && Globals.bAnimationSupported) { - $('.i18n-animation.i18n', oElements).letterfx({ + $('.i18n-animation[data-i18n]', oElements).letterfx({ 'fx': 'fall fade', 'backwards': false, 'timing': 50, 'fx_duration': '50ms', 'letter_end': 'restore', 'element_end': 'restore' }); } diff --git a/dev/View/Popup/Contacts.js b/dev/View/Popup/Contacts.js index cbe6863fb..08e7d2b80 100644 --- a/dev/View/Popup/Contacts.js +++ b/dev/View/Popup/Contacts.js @@ -405,7 +405,7 @@ kn.extendAsViewModel(['View/Popup/Contacts', 'PopupsContactsViewModel'], ContactsPopupView); _.extend(ContactsPopupView.prototype, AbstractView.prototype); - ContactsPopupView.prototype.getPropertyPlceholder = function (sType) + ContactsPopupView.prototype.getPropertyPlaceholder = function (sType) { var sResult = ''; switch (sType) @@ -426,7 +426,7 @@ ContactsPopupView.prototype.addNewProperty = function (sType, sTypeStr) { - this.viewProperties.push(new ContactPropertyModel(sType, sTypeStr || '', '', true, this.getPropertyPlceholder(sType))); + this.viewProperties.push(new ContactPropertyModel(sType, sTypeStr || '', '', true, this.getPropertyPlaceholder(sType))); }; ContactsPopupView.prototype.addNewOrFocusProperty = function (sType, sTypeStr) @@ -649,10 +649,10 @@ } aList.unshift(new ContactPropertyModel(Enums.ContactPropertyType.LastName, '', sLastName, false, - this.getPropertyPlceholder(Enums.ContactPropertyType.LastName))); + this.getPropertyPlaceholder(Enums.ContactPropertyType.LastName))); aList.unshift(new ContactPropertyModel(Enums.ContactPropertyType.FirstName, '', sFirstName, !oContact, - this.getPropertyPlceholder(Enums.ContactPropertyType.FirstName))); + this.getPropertyPlaceholder(Enums.ContactPropertyType.FirstName))); this.viewID(sId); diff --git a/rainloop/v/0.0.0/app/templates/Views/Admin/AdminMenu.html b/rainloop/v/0.0.0/app/templates/Views/Admin/AdminMenu.html index 13fdc3ece..673634bbb 100644 --- a/rainloop/v/0.0.0/app/templates/Views/Admin/AdminMenu.html +++ b/rainloop/v/0.0.0/app/templates/Views/Admin/AdminMenu.html @@ -10,12 +10,12 @@
- + - +
diff --git a/rainloop/v/0.0.0/app/templates/Views/Common/PopupsKeyboardShortcutsHelp.html b/rainloop/v/0.0.0/app/templates/Views/Common/PopupsKeyboardShortcutsHelp.html index 22d4deb70..f027a6f4a 100644 --- a/rainloop/v/0.0.0/app/templates/Views/Common/PopupsKeyboardShortcutsHelp.html +++ b/rainloop/v/0.0.0/app/templates/Views/Common/PopupsKeyboardShortcutsHelp.html @@ -2,21 +2,21 @@
-

+

  • - +
  • - +
  • - +
  • - +

@@ -25,12 +25,12 @@ - - - - - - + + + + + +
` (tilde)
R
A
F
Shift + F
?, Shift + /
` (tilde)
R
A
F
Shift + F
?, Shift + /
@@ -39,19 +39,19 @@ - - - - - - - - - - - - - + + + + + + + + + + + + +
Ctrl + A, Command + A
Z
Delete, Shift + Delete, #
M
Q
U
I
/
Esc
Enter
Enter
→, Tab
←, Shift + Tab
Ctrl + A, Command + A
Z
Delete, Shift + Delete, #
M
Q
U
I
/
Esc
Enter
Enter
→, Tab
←, Shift + Tab
@@ -60,14 +60,14 @@ - - - - - - - - + + + + + + + +
Toggle fullscreen modeEnter
Toggle message blockquotesB
Next message in threadCtrl + ←, Command + ←
Previous message in threadCtrl + →, Command + →
PrintCtrl + P, Command + P
Exit fullscreen modeEsc
Close message (No preview pane layout)Esc
Switch focus back to message listTab, Shift + Tab, Esc
Toggle fullscreen modeEnter
Toggle message blockquotesB
Next message in threadCtrl + ←, Command + ←
Previous message in threadCtrl + →, Command + →
PrintCtrl + P, Command + P
Exit fullscreen modeEsc
Close message (No preview pane layout)Esc
Switch focus back to message listTab, Shift + Tab, Esc
@@ -76,11 +76,11 @@ - - - - - + + + + +
W, C
Ctrl + Q, Command + Q
Ctrl + S, Command + S
Esc
W, C
Ctrl + Q, Command + Q
Ctrl + S, Command + S
Esc
diff --git a/rainloop/v/0.0.0/app/templates/Views/Common/PopupsLanguages.html b/rainloop/v/0.0.0/app/templates/Views/Common/PopupsLanguages.html index fc5418c6b..b1688aa93 100644 --- a/rainloop/v/0.0.0/app/templates/Views/Common/PopupsLanguages.html +++ b/rainloop/v/0.0.0/app/templates/Views/Common/PopupsLanguages.html @@ -3,7 +3,7 @@

- +

diff --git a/rainloop/v/0.0.0/app/templates/Views/Components/Checkbox.html b/rainloop/v/0.0.0/app/templates/Views/Components/Checkbox.html index b00a75f1e..ef7c7e362 100644 --- a/rainloop/v/0.0.0/app/templates/Views/Components/Checkbox.html +++ b/rainloop/v/0.0.0/app/templates/Views/Components/Checkbox.html @@ -5,6 +5,6 @@ ">    - + \ No newline at end of file diff --git a/rainloop/v/0.0.0/app/templates/Views/Components/CheckboxClassic.html b/rainloop/v/0.0.0/app/templates/Views/Components/CheckboxClassic.html index 4169e29fc..349d3197d 100644 --- a/rainloop/v/0.0.0/app/templates/Views/Components/CheckboxClassic.html +++ b/rainloop/v/0.0.0/app/templates/Views/Components/CheckboxClassic.html @@ -2,6 +2,6 @@    - + \ No newline at end of file diff --git a/rainloop/v/0.0.0/app/templates/Views/Components/CheckboxMaterialDesign.html b/rainloop/v/0.0.0/app/templates/Views/Components/CheckboxMaterialDesign.html index df3391cca..82e9db65b 100644 --- a/rainloop/v/0.0.0/app/templates/Views/Components/CheckboxMaterialDesign.html +++ b/rainloop/v/0.0.0/app/templates/Views/Components/CheckboxMaterialDesign.html @@ -5,6 +5,6 @@ 'box': animationBox, 'checkmark': animationCheckmark}">
- + \ No newline at end of file diff --git a/rainloop/v/0.0.0/app/templates/Views/Components/Input.html b/rainloop/v/0.0.0/app/templates/Views/Components/Input.html index 263b546a6..12215d19d 100644 --- a/rainloop/v/0.0.0/app/templates/Views/Components/Input.html +++ b/rainloop/v/0.0.0/app/templates/Views/Components/Input.html @@ -1,8 +1,8 @@ - +   - +   diff --git a/rainloop/v/0.0.0/app/templates/Views/Components/Radio.html b/rainloop/v/0.0.0/app/templates/Views/Components/Radio.html index 1318eaf83..0aef66eca 100644 --- a/rainloop/v/0.0.0/app/templates/Views/Components/Radio.html +++ b/rainloop/v/0.0.0/app/templates/Views/Components/Radio.html @@ -2,6 +2,6 @@
\ No newline at end of file diff --git a/rainloop/v/0.0.0/app/templates/Views/Components/Select.html b/rainloop/v/0.0.0/app/templates/Views/Components/Select.html index 84a524bf9..0cdcdf4dc 100644 --- a/rainloop/v/0.0.0/app/templates/Views/Components/Select.html +++ b/rainloop/v/0.0.0/app/templates/Views/Components/Select.html @@ -1,12 +1,12 @@ - +      - +   diff --git a/rainloop/v/0.0.0/app/templates/Views/Components/TextArea.html b/rainloop/v/0.0.0/app/templates/Views/Components/TextArea.html index e403fb2ea..3565e30b7 100644 --- a/rainloop/v/0.0.0/app/templates/Views/Components/TextArea.html +++ b/rainloop/v/0.0.0/app/templates/Views/Components/TextArea.html @@ -1,5 +1,5 @@ - +  
- + data-bind="textInput: email, hasFocus: emailFocus" data-i18n="[placeholder]LOGIN/LABEL_EMAIL" /> @@ -35,7 +36,7 @@
+ data-bind="textInput: password, hasFocus: passwordFocus" data-i18n="[placeholder]LOGIN/LABEL_PASSWORD" /> @@ -44,7 +45,7 @@
+ data-bind="textInput: additionalCode, hasFocus: additionalCode.focused" data-i18n="[placeholder]LOGIN/LABEL_VERIFICATION_CODE" /> @@ -54,14 +55,14 @@
{{INCLUDE/BottomControlGroup/PLACE}}
@@ -82,18 +83,18 @@
+ >
 
+ >
diff --git a/rainloop/v/0.0.0/app/templates/Views/User/MailMessageList.html b/rainloop/v/0.0.0/app/templates/Views/User/MailMessageList.html index 22b360754..f1963ead6 100644 --- a/rainloop/v/0.0.0/app/templates/Views/User/MailMessageList.html +++ b/rainloop/v/0.0.0/app/templates/Views/User/MailMessageList.html @@ -53,35 +53,35 @@    - + @@ -89,7 +89,7 @@    - + @@ -97,14 +97,14 @@    - + @@ -117,7 +117,7 @@
+ data-i18n="[placeholder]SEARCH/MAIN_INPUT_PLACEHOLDER" data-bind="value: inputProxyMessageListSearch, onEnter: searchEnterAction, hasfocus: inputMessageListSearchFocus" /> @@ -140,23 +140,23 @@
   - +
- +
- +
- ... + ...
- +
diff --git a/rainloop/v/0.0.0/app/templates/Views/User/MailMessageView.html b/rainloop/v/0.0.0/app/templates/Views/User/MailMessageView.html index 9e08f2d0f..86dcdbd9f 100644 --- a/rainloop/v/0.0.0/app/templates/Views/User/MailMessageView.html +++ b/rainloop/v/0.0.0/app/templates/Views/User/MailMessageView.html @@ -50,7 +50,7 @@
- +
@@ -74,7 +74,7 @@    - + @@ -112,28 +112,28 @@    - + @@ -141,14 +141,14 @@    - + @@ -156,14 +156,14 @@    - + @@ -252,7 +252,7 @@ data-bind="text: viewThreadsControlDesc">) ! - +
@@ -265,7 +265,7 @@ - : + : @@ -278,7 +278,7 @@
- : + :  
@@ -288,27 +288,27 @@
- : + :  
- : + :  
- : + :  
- : + :  
- : + :     @@ -335,7 +335,7 @@
- ... + ...
@@ -343,12 +343,12 @@
   - +
   - +
@@ -358,16 +358,16 @@
   - +
   - +    + style="margin-bottom: 0" data-i18n="[placeholder]MESSAGE/PGP_PASSWORD_INPUT_PLACEHOLDER" data-bind="value: viewPgpPassword, onEnter: function() { decryptPgpEncryptedMessage(message()); }" />
    diff --git a/rainloop/v/0.0.0/app/templates/Views/User/PhotoSwipe.html b/rainloop/v/0.0.0/app/templates/Views/User/PhotoSwipe.html index 055b5de52..f256ed71f 100644 --- a/rainloop/v/0.0.0/app/templates/Views/User/PhotoSwipe.html +++ b/rainloop/v/0.0.0/app/templates/Views/User/PhotoSwipe.html @@ -9,9 +9,9 @@
    - - - + + +
    @@ -23,8 +23,8 @@ - - + +
    diff --git a/rainloop/v/0.0.0/app/templates/Views/User/PopupsAccount.html b/rainloop/v/0.0.0/app/templates/Views/User/PopupsAccount.html index 77ce5fa4e..02f49708c 100644 --- a/rainloop/v/0.0.0/app/templates/Views/User/PopupsAccount.html +++ b/rainloop/v/0.0.0/app/templates/Views/User/PopupsAccount.html @@ -4,8 +4,8 @@

    - - + +

    @@ -20,7 +20,7 @@

    - +
    - +
    @@ -41,8 +41,8 @@    - - + +
    diff --git a/rainloop/v/0.0.0/app/templates/Views/User/PopupsAddOpenPgpKey.html b/rainloop/v/0.0.0/app/templates/Views/User/PopupsAddOpenPgpKey.html index e823a5a99..e2b0374e8 100644 --- a/rainloop/v/0.0.0/app/templates/Views/User/PopupsAddOpenPgpKey.html +++ b/rainloop/v/0.0.0/app/templates/Views/User/PopupsAddOpenPgpKey.html @@ -4,7 +4,7 @@

    - +

    @@ -18,7 +18,7 @@    - +
    diff --git a/rainloop/v/0.0.0/app/templates/Views/User/PopupsAdvancedSearch.html b/rainloop/v/0.0.0/app/templates/Views/User/PopupsAdvancedSearch.html index 2797989f7..508979073 100644 --- a/rainloop/v/0.0.0/app/templates/Views/User/PopupsAdvancedSearch.html +++ b/rainloop/v/0.0.0/app/templates/Views/User/PopupsAdvancedSearch.html @@ -3,7 +3,7 @@

    - +

    @@ -13,7 +13,7 @@
    @@ -100,7 +100,7 @@
    diff --git a/rainloop/v/0.0.0/app/templates/Views/User/PopupsCompose.html b/rainloop/v/0.0.0/app/templates/Views/User/PopupsCompose.html index 938f245df..5603f3b29 100644 --- a/rainloop/v/0.0.0/app/templates/Views/User/PopupsCompose.html +++ b/rainloop/v/0.0.0/app/templates/Views/User/PopupsCompose.html @@ -4,12 +4,12 @@    - +    - + × @@ -27,7 +27,7 @@
    @@ -57,21 +57,21 @@    - +
  •    - +
  •    - +
  • @@ -79,7 +79,7 @@    - +
@@ -92,15 +92,15 @@
 
-    -    -   @@ -109,19 +109,19 @@
- +
- +
@@ -129,7 +129,7 @@
- +
@@ -137,7 +137,7 @@
- +
@@ -145,7 +145,7 @@
- +
@@ -171,10 +171,10 @@
- + - +
@@ -203,11 +203,11 @@
- +
    - +
    diff --git a/rainloop/v/0.0.0/app/templates/Views/User/PopupsComposeOpenPgp.html b/rainloop/v/0.0.0/app/templates/Views/User/PopupsComposeOpenPgp.html index f53b05163..68e6051a0 100644 --- a/rainloop/v/0.0.0/app/templates/Views/User/PopupsComposeOpenPgp.html +++ b/rainloop/v/0.0.0/app/templates/Views/User/PopupsComposeOpenPgp.html @@ -4,7 +4,7 @@

    - +

    @@ -32,7 +32,7 @@
    - +
    @@ -44,9 +44,9 @@
    diff --git a/rainloop/v/0.0.0/app/templates/Views/User/PopupsContacts.html b/rainloop/v/0.0.0/app/templates/Views/User/PopupsContacts.html index 44e5009a5..9c348f6e5 100644 --- a/rainloop/v/0.0.0/app/templates/Views/User/PopupsContacts.html +++ b/rainloop/v/0.0.0/app/templates/Views/User/PopupsContacts.html @@ -10,7 +10,7 @@    - +
    @@ -37,7 +37,7 @@    - + @@ -45,14 +45,14 @@    - + @@ -60,7 +60,7 @@    - + @@ -71,22 +71,22 @@
    + data-i18n="[placeholder]CONTACTS/SEARCH_INPUT_PLACEHOLDER" data-bind="value: search" />
    - +
    - +
    - ... + ...
    - +
    @@ -119,7 +119,7 @@
    - +    @@ -128,21 +128,21 @@    - + @@ -150,12 +150,12 @@    - + @@ -165,8 +165,8 @@
    @@ -174,7 +174,7 @@
    - +
    @@ -186,7 +186,7 @@
    -
    @@ -195,13 +195,13 @@
    - - @@ -217,12 +217,12 @@
    -
    - +
    @@ -233,7 +233,7 @@
    -
    diff --git a/rainloop/v/0.0.0/app/templates/Views/User/PopupsFilter.html b/rainloop/v/0.0.0/app/templates/Views/User/PopupsFilter.html index 08bd2118f..b82169a7e 100644 --- a/rainloop/v/0.0.0/app/templates/Views/User/PopupsFilter.html +++ b/rainloop/v/0.0.0/app/templates/Views/User/PopupsFilter.html @@ -4,8 +4,8 @@

    - - + +

    @@ -14,38 +14,39 @@
    -
    -
    +
    - +

       - +

    -
    +
    @@ -55,7 +56,7 @@    - +
    diff --git a/rainloop/v/0.0.0/app/templates/Views/User/PopupsFolderClear.html b/rainloop/v/0.0.0/app/templates/Views/User/PopupsFolderClear.html index f8f9cf65a..ee3d4c0a0 100644 --- a/rainloop/v/0.0.0/app/templates/Views/User/PopupsFolderClear.html +++ b/rainloop/v/0.0.0/app/templates/Views/User/PopupsFolderClear.html @@ -4,8 +4,8 @@

    - - + +

    @@ -13,20 +13,20 @@    - +


    - +
       - +
    diff --git a/rainloop/v/0.0.0/app/templates/Views/User/PopupsFolderCreate.html b/rainloop/v/0.0.0/app/templates/Views/User/PopupsFolderCreate.html index bd2a8c5dc..82b86e105 100644 --- a/rainloop/v/0.0.0/app/templates/Views/User/PopupsFolderCreate.html +++ b/rainloop/v/0.0.0/app/templates/Views/User/PopupsFolderCreate.html @@ -4,7 +4,7 @@

    - +

    @@ -12,7 +12,7 @@

    - - + +

    @@ -16,7 +16,7 @@

    - +
    - +
    - +
    - +
    - +
    -    -
    @@ -90,8 +90,8 @@    - - + +
    diff --git a/rainloop/v/0.0.0/app/templates/Views/User/PopupsNewOpenPgpKey.html b/rainloop/v/0.0.0/app/templates/Views/User/PopupsNewOpenPgpKey.html index de6595f72..2a5e3de71 100644 --- a/rainloop/v/0.0.0/app/templates/Views/User/PopupsNewOpenPgpKey.html +++ b/rainloop/v/0.0.0/app/templates/Views/User/PopupsNewOpenPgpKey.html @@ -4,13 +4,13 @@

    - +

    - +
    - +
    - +
    - +
    @@ -45,7 +45,7 @@    - +
    diff --git a/rainloop/v/0.0.0/app/templates/Views/User/PopupsTemplate.html b/rainloop/v/0.0.0/app/templates/Views/User/PopupsTemplate.html index 49dda2876..fdfc11b00 100644 --- a/rainloop/v/0.0.0/app/templates/Views/User/PopupsTemplate.html +++ b/rainloop/v/0.0.0/app/templates/Views/User/PopupsTemplate.html @@ -4,8 +4,8 @@

    - - + +

    @@ -16,7 +16,7 @@

    - +
    @@ -35,8 +35,8 @@    - - + +
    diff --git a/rainloop/v/0.0.0/app/templates/Views/User/PopupsTwoFactorTest.html b/rainloop/v/0.0.0/app/templates/Views/User/PopupsTwoFactorTest.html index eddd2df9c..92cc80b06 100644 --- a/rainloop/v/0.0.0/app/templates/Views/User/PopupsTwoFactorTest.html +++ b/rainloop/v/0.0.0/app/templates/Views/User/PopupsTwoFactorTest.html @@ -4,7 +4,7 @@

    - +

    @@ -12,7 +12,7 @@
       - +
    diff --git a/rainloop/v/0.0.0/app/templates/Views/User/PopupsViewOpenPgpKey.html b/rainloop/v/0.0.0/app/templates/Views/User/PopupsViewOpenPgpKey.html index ea24187fe..c3673a82c 100644 --- a/rainloop/v/0.0.0/app/templates/Views/User/PopupsViewOpenPgpKey.html +++ b/rainloop/v/0.0.0/app/templates/Views/User/PopupsViewOpenPgpKey.html @@ -4,7 +4,7 @@

    - +

    @@ -18,12 +18,12 @@    - +    - +
    diff --git a/rainloop/v/0.0.0/app/templates/Views/User/PopupsWindowSimpleMessage.html b/rainloop/v/0.0.0/app/templates/Views/User/PopupsWindowSimpleMessage.html index d619ef09c..6849d27c7 100644 --- a/rainloop/v/0.0.0/app/templates/Views/User/PopupsWindowSimpleMessage.html +++ b/rainloop/v/0.0.0/app/templates/Views/User/PopupsWindowSimpleMessage.html @@ -81,35 +81,35 @@ pre { - + - + - + - + - + - + - + - + diff --git a/rainloop/v/0.0.0/app/templates/Views/User/SettingsAccounts.html b/rainloop/v/0.0.0/app/templates/Views/User/SettingsAccounts.html index ff0b2f7aa..a09dedffe 100644 --- a/rainloop/v/0.0.0/app/templates/Views/User/SettingsAccounts.html +++ b/rainloop/v/0.0.0/app/templates/Views/User/SettingsAccounts.html @@ -2,7 +2,7 @@
    - +    
    @@ -10,7 +10,7 @@    - +

    @@ -32,7 +32,7 @@
    - + @@ -48,13 +48,13 @@
    - +
       - +

    @@ -74,13 +74,13 @@    - () + ()     		- + diff --git a/rainloop/v/0.0.0/app/templates/Views/User/SettingsChangePassword.html b/rainloop/v/0.0.0/app/templates/Views/User/SettingsChangePassword.html index 099fc3862..810e3c4d3 100644 --- a/rainloop/v/0.0.0/app/templates/Views/User/SettingsChangePassword.html +++ b/rainloop/v/0.0.0/app/templates/Views/User/SettingsChangePassword.html @@ -1,13 +1,13 @@
    - +
       - +
    diff --git a/rainloop/v/0.0.0/app/templates/Views/User/SettingsContacts.html b/rainloop/v/0.0.0/app/templates/Views/User/SettingsContacts.html index 6eab600a3..7ace99ae4 100644 --- a/rainloop/v/0.0.0/app/templates/Views/User/SettingsContacts.html +++ b/rainloop/v/0.0.0/app/templates/Views/User/SettingsContacts.html @@ -1,7 +1,7 @@
    - +
    @@ -18,7 +18,7 @@
    - +
    @@ -33,7 +33,7 @@
    - +    
    @@ -11,7 +11,7 @@    - +       - +
    @@ -35,7 +35,7 @@
       - +
    @@ -55,7 +55,7 @@ 
    -						:
+						:
    + data-i18n="[placeholder]POPUPS_FILTER/REJECT_MESSAGE_LABEL">
    \ No newline at end of file diff --git a/rainloop/v/0.0.0/app/templates/Views/User/SettingsFiltersActionVacation.html b/rainloop/v/0.0.0/app/templates/Views/User/SettingsFiltersActionVacation.html index f32fe427a..65c253145 100644 --- a/rainloop/v/0.0.0/app/templates/Views/User/SettingsFiltersActionVacation.html +++ b/rainloop/v/0.0.0/app/templates/Views/User/SettingsFiltersActionVacation.html @@ -9,14 +9,14 @@ size: 1 } }">
    - +
    + data-i18n="[placeholder]POPUPS_FILTER/VACATION_MESSAGE_LABEL">
    diff --git a/rainloop/v/0.0.0/app/templates/Views/User/SettingsFolderItem.html b/rainloop/v/0.0.0/app/templates/Views/User/SettingsFolderItem.html index 5a7a1a884..a82905374 100644 --- a/rainloop/v/0.0.0/app/templates/Views/User/SettingsFolderItem.html +++ b/rainloop/v/0.0.0/app/templates/Views/User/SettingsFolderItem.html @@ -9,7 +9,7 @@ data-bind="value: nameForEdit, visible: edited, hasfocus: edited, onEnter: function () { $root.folderEditOnEnter($data); }, onEsc: function () { $root.folderEditOnEsc($data); }" /> - +
    		diff --git a/rainloop/v/0.0.0/app/templates/Views/User/SettingsFolders.html b/rainloop/v/0.0.0/app/templates/Views/User/SettingsFolders.html index 9c5106719..5f0ca4ef5 100644 --- a/rainloop/v/0.0.0/app/templates/Views/User/SettingsFolders.html +++ b/rainloop/v/0.0.0/app/templates/Views/User/SettingsFolders.html @@ -1,7 +1,7 @@
    - +    
    @@ -9,18 +9,18 @@    - +       - +
    - +
    - +
    diff --git a/rainloop/v/0.0.0/app/templates/Views/User/SettingsGeneral.html b/rainloop/v/0.0.0/app/templates/Views/User/SettingsGeneral.html index 2ea6c6b98..6af2aefee 100644 --- a/rainloop/v/0.0.0/app/templates/Views/User/SettingsGeneral.html +++ b/rainloop/v/0.0.0/app/templates/Views/User/SettingsGeneral.html @@ -1,11 +1,11 @@
    - +
    @@ -23,7 +23,7 @@
    - +
    @@ -125,7 +125,7 @@ }">
      - +
    diff --git a/rainloop/v/0.0.0/app/templates/Views/User/SettingsMenu.html b/rainloop/v/0.0.0/app/templates/Views/User/SettingsMenu.html index c7d9774e2..425d26ae6 100644 --- a/rainloop/v/0.0.0/app/templates/Views/User/SettingsMenu.html +++ b/rainloop/v/0.0.0/app/templates/Views/User/SettingsMenu.html @@ -3,12 +3,12 @@
    - + - +
    diff --git a/rainloop/v/0.0.0/app/templates/Views/User/SettingsOpenPGP.html b/rainloop/v/0.0.0/app/templates/Views/User/SettingsOpenPGP.html index 63189d085..faa0f85fd 100644 --- a/rainloop/v/0.0.0/app/templates/Views/User/SettingsOpenPGP.html +++ b/rainloop/v/0.0.0/app/templates/Views/User/SettingsOpenPGP.html @@ -1,19 +1,19 @@
    - +
       - +       - +

    @@ -28,10 +28,10 @@
    - + - + @@ -49,11 +49,11 @@
    - + () - + diff --git a/rainloop/v/0.0.0/app/templates/Views/User/SettingsPane.html b/rainloop/v/0.0.0/app/templates/Views/User/SettingsPane.html index da4ccc8df..f63a420f9 100644 --- a/rainloop/v/0.0.0/app/templates/Views/User/SettingsPane.html +++ b/rainloop/v/0.0.0/app/templates/Views/User/SettingsPane.html @@ -4,7 +4,7 @@    - + diff --git a/rainloop/v/0.0.0/app/templates/Views/User/SettingsSecurity.html b/rainloop/v/0.0.0/app/templates/Views/User/SettingsSecurity.html index dff8d11ba..1ffb2b561 100644 --- a/rainloop/v/0.0.0/app/templates/Views/User/SettingsSecurity.html +++ b/rainloop/v/0.0.0/app/templates/Views/User/SettingsSecurity.html @@ -1,11 +1,11 @@
    - +
    - +
    @@ -41,7 +41,7 @@
    @@ -52,18 +52,18 @@    - +    - +       - +
    @@ -71,21 +71,21 @@
    ... + data-i18n="SETTINGS_SECURITY/BUTTON_SHOW_SECRET">
       - +

    -

    +

    @@ -94,13 +94,13 @@ 
    
 				
    
 				
    
-					
    
+					
    
 				
    
 			
    
 		
    
diff --git a/rainloop/v/0.0.0/app/templates/Views/User/SettingsSocial.html b/rainloop/v/0.0.0/app/templates/Views/User/SettingsSocial.html
index efeea12a1..be95614d7 100644
--- a/rainloop/v/0.0.0/app/templates/Views/User/SettingsSocial.html
+++ b/rainloop/v/0.0.0/app/templates/Views/User/SettingsSocial.html
@@ -1,19 +1,19 @@
 
    
 	
    
 		
    
-			
+			
 		
    
 		
    
 			
 			
    
 			
    
 			
    
-				
    
+				
    
 			
    
 		
    
 		
    
@@ -28,25 +28,25 @@
 				
 				
 				  
-				
+				
 			
 		
    
 	
    
 	
    
 		
    
-			
+			
 		
    
 		
    
 			
 			
    
 			
    
 			
    
-				
    
+				
    
 			
    
 		
    
 		
    
@@ -61,25 +61,25 @@
 				
 				
 				  
-				
+				
 			
 		
    
 	
    
 	
    
 		
    
-			
+			
 		
    
 		
    
 			
 			
    
 			
    
 			
    
-				
    
+				
    
 			
    
 		
    
 		
    
@@ -94,7 +94,7 @@
 				
 				
 				  
-				
+				
 			
 		
    
 	
    
diff --git a/rainloop/v/0.0.0/app/templates/Views/User/SettingsTemplates.html b/rainloop/v/0.0.0/app/templates/Views/User/SettingsTemplates.html
index de8827af1..341ac972f 100644
--- a/rainloop/v/0.0.0/app/templates/Views/User/SettingsTemplates.html
+++ b/rainloop/v/0.0.0/app/templates/Views/User/SettingsTemplates.html
@@ -1,7 +1,7 @@
 
    
 	
    
 		
    
-			
+			
 			   
 			
 		
    
@@ -9,7 +9,7 @@
 	
 		
 		  
-		
+		
 	
 	
    
 	
    
@@ -30,7 +30,7 @@
 				
    		
 				
 					
-						
+						
 					
 				
 				
diff --git a/rainloop/v/0.0.0/app/templates/Views/User/SettingsThemes.html b/rainloop/v/0.0.0/app/templates/Views/User/SettingsThemes.html
index 0ce08b788..cc86478ec 100644
--- a/rainloop/v/0.0.0/app/templates/Views/User/SettingsThemes.html
+++ b/rainloop/v/0.0.0/app/templates/Views/User/SettingsThemes.html
@@ -1,7 +1,7 @@
 
    
 	
    
 		
    
-			
+			
 			  
 			
    
 		
    
-			
+			
 		
    
 		
    
 			
    
@@ -36,7 +36,7 @@
 				
 					
 					  
-					
+					
 				
 			
    
 		
    
diff --git a/rainloop/v/0.0.0/app/templates/Views/User/SystemDropDown.html b/rainloop/v/0.0.0/app/templates/Views/User/SystemDropDown.html
index fa94da267..8235aa1ef 100644
--- a/rainloop/v/0.0.0/app/templates/Views/User/SystemDropDown.html
+++ b/rainloop/v/0.0.0/app/templates/Views/User/SystemDropDown.html
@@ -39,7 +39,7 @@
 						
 							
 							  
-							
+							
 						
 					
 					
@@ -47,14 +47,14 @@
 						
 							
 							  
-							
+							
 						
 					
 					
 					
@@ -62,7 +62,7 @@
 						
 							
 							  
-							
+