From a827641e33f88a5ac573e81e95b14f98a039f416 Mon Sep 17 00:00:00 2001 From: Dominik Csapak Date: Thu, 7 Mar 2019 14:21:58 +0100 Subject: [PATCH] fix gettext invocations using gettext the way we did, broke the jsgettext.pl in proxmox-i18n during a 'make update' instead of using the template way, simply replace it by using plain gettext as a function, this way we do not skip over the getttext uses accidentally Signed-off-by: Dominik Csapak --- js/mobile/app.js | 1 - js/mobile/loginscreen.js | 6 +++--- js/mobile/mailview.js | 10 +++++----- js/mobile/quarantineview.js | 18 +++++++++--------- js/mobile/utils.js | 4 ---- 5 files changed, 17 insertions(+), 22 deletions(-) diff --git a/js/mobile/app.js b/js/mobile/app.js index 68fb9e5..d11c63b 100644 --- a/js/mobile/app.js +++ b/js/mobile/app.js @@ -26,7 +26,6 @@ var app = new Framework7({ async: function(routeTo, routeFrom, resolve, reject) { let action = routeTo.params.action; let mailid = routeTo.params.mailid; - let confirmText = gettext('') app.dialog.confirm( `${action}: ${mailid}`, gettext('Confirm'), diff --git a/js/mobile/loginscreen.js b/js/mobile/loginscreen.js index 36dc994..cd7a370 100644 --- a/js/mobile/loginscreen.js +++ b/js/mobile/loginscreen.js @@ -16,7 +16,7 @@ class LoginScreen extends Component {
Username
- +
@@ -25,7 +25,7 @@ class LoginScreen extends Component {
Password
- +
@@ -35,7 +35,7 @@ class LoginScreen extends Component {
  • - +
diff --git a/js/mobile/mailview.js b/js/mobile/mailview.js index c89d134..3645b81 100644 --- a/js/mobile/mailview.js +++ b/js/mobile/mailview.js @@ -7,7 +7,7 @@ class MailView extends Component {
- {{gettext "Back"}} + ` + gettext("Back") + `
Preview
@@ -26,28 +26,28 @@ class MailView extends Component { close close - {{gettext "Blacklist"}} + ` + gettext("Blacklist") + ` check check - {{gettext "Whitelist"}} + ` + gettext("Whitelist") + ` trash delete - {{gettext "Delete"}} + ` + gettext("Delete") + ` paper_plane send - {{gettext "Deliver"}} + ` + gettext("Deliver") + ` diff --git a/js/mobile/quarantineview.js b/js/mobile/quarantineview.js index 7113214..b6203bc 100644 --- a/js/mobile/quarantineview.js +++ b/js/mobile/quarantineview.js @@ -12,12 +12,12 @@ class QuarantineView extends Component {
-
{{gettext "Range"}}
+
` + gettext("Range") + `
  • -
    {{gettext "From"}}
    +
    ` + gettext("From") + `
    @@ -25,14 +25,14 @@ class QuarantineView extends Component {
  • -
    {{gettext "To"}}
    +
    ` + gettext("To") + `
- {{gettext "OK"}} + ` + gettext("OK") + `
@@ -47,7 +47,7 @@ class QuarantineView extends Component { alert warning - {{gettext "No valid subscription"}} + ` + gettext("No valid subscription") + `
@@ -78,24 +78,24 @@ class QuarantineView extends Component { paper_plane send -  {{gettext "Deliver"}} +  ` + gettext("Deliver") + ` check check -  {{gettext "Whitelist"}} +  ` + gettext("Whitelist") + `
close close -  {{gettext "Blacklist"}} +  ` + gettext("Blacklist") + ` trash delete -  {{gettext "Delete"}} +  ` + gettext("Delete") + `
`; diff --git a/js/mobile/utils.js b/js/mobile/utils.js index 2b27d36..50810a0 100644 --- a/js/mobile/utils.js +++ b/js/mobile/utils.js @@ -1,7 +1,3 @@ -Template7.registerHelper('gettext', function(value) { - return gettext(value); -}); - var PMG = { Utils: { getCookie(name) {