improve gettext usage

optimized a few string
EMail/Email/E-mail -> E-Mail
No Data in Database/No data in database. -> No data in database
etc.

removed 'Outlook 2007' from gettext
added some strings to gettext where they were missing
(e.g. Active, etc.)

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>

diff --git a/js/ContactStatistics.js b/js/ContactStatistics.js
index 948f6d064a19ab655527cf7d3f7d5f056962789c..59a7a17cc9c869f7580248c380918444e397d628 100644 (file)
--- a/js/ContactStatistics.js
+++ b/js/ContactStatistics.js
@@ -11,7 +11,7 @@ Ext.define('PMG.ContactDetails', {
            xtype: 'panel',
            itemId: 'info',
            bodyPadding: 10,
-           html: gettext('Please select a contact.')
+           html: gettext('Please select a contact')
        }
     ],
 
@@ -105,7 +105,7 @@ Ext.define('PMG.ContactList', {
     multiColumnSort: true,
     plugins: 'gridfilters',
 
-    emptyText: gettext('No data in database.'),
+    emptyText: gettext('No data in database'),
     viewConfig: {
        deferEmptyText: false
     },

diff --git a/js/Dashboard.js b/js/Dashboard.js
index add8422d9e954a47768a6909dfc7f9963fe44dee..805d796672c9827ff7d033b52778cac2807b6ca3 100644 (file)
--- a/js/Dashboard.js
+++ b/js/Dashboard.js
@@ -373,7 +373,7 @@ Ext.define('PMG.Dashboard', {
        {
            height: 250,
            iconCls: 'fa fa-tasks',
-           title: 'Node Resources',
+           title: gettext('Node Resources'),
            bodyPadding: '0 20 0 20',
            layout: {
                type: 'hbox',

diff --git a/js/DomainStatistics.js b/js/DomainStatistics.js
index a3fa8625f170a915cd6fdad1afa30fc731338ea5..9bce8aefb6a4c44b85c8933272467a59b5aa881c 100644 (file)
--- a/js/DomainStatistics.js
+++ b/js/DomainStatistics.js
@@ -64,7 +64,7 @@ Ext.define('PMG.DomainStatistics', {
                    border: false,
                    disableSelection: true,
                    store: store_in,
-                   emptyText: gettext('No data in database.'),
+                   emptyText: gettext('No data in database'),
                    viewConfig: {
                        deferEmptyText: false
                    },
@@ -108,7 +108,7 @@ Ext.define('PMG.DomainStatistics', {
                    border: false,
                    disableSelection: true,
                    store: store_out,
-                   emptyText: gettext('No data in database.'),
+                   emptyText: gettext('No data in database'),
                    viewConfig: {
                        deferEmptyText: false
                    },

diff --git a/js/FetchmailEdit.js b/js/FetchmailEdit.js
index a268dfaeab3c8d988ebebf29f3d76c020eb30ae1..cafb9ea884317093ead33578ab9128eef11cf172 100644 (file)
--- a/js/FetchmailEdit.js
+++ b/js/FetchmailEdit.js
@@ -67,7 +67,7 @@ Ext.define('PMG.FetchmailEdit', {
                xtype: 'textfield',
                name: 'pass',
                inputType: 'password',
-               fieldLabel: gettext('Passsword'),
+               fieldLabel: gettext('Password'),
                allowBlank: false
            },
            {

diff --git a/js/LDAPUserSelector.js b/js/LDAPUserSelector.js
index c3d6e983e857f73de82015dccf9e07a0e283d431..3b68e41eaf90c43f9bcf823ea6d9d1e6ee8163d2 100644 (file)
--- a/js/LDAPUserSelector.js
+++ b/js/LDAPUserSelector.js
@@ -29,7 +29,7 @@ Ext.define('PMG.LDAPUserSelector', {
                width: 100
            },
            {
-               header: gettext('EMail'),
+               header: gettext('E-Mail'),
                dataIndex: 'pmail',
                width: 150
            },

diff --git a/js/MailTracker.js b/js/MailTracker.js
index d4624a5dfc33343671d70a79ca71d9c408f6d05e..9cf9fa497d4b159bde6c4defac525799b57151a9 100644 (file)
--- a/js/MailTracker.js
+++ b/js/MailTracker.js
@@ -217,7 +217,7 @@ Ext.define('PMG.MailTracker', {
 
     border: false,
 
-    emptyText: gettext('No data in database.'),
+    emptyText: gettext('No data in database'),
     disableSelection: true,
 
     viewConfig: {

diff --git a/js/MainView.js b/js/MainView.js
index 4d48325f5330222ae968f88603bd7b95ae7e6b47..1bcd83572a039a349da5d7a8d6eca64a5b842741 100644 (file)
--- a/js/MainView.js
+++ b/js/MainView.js
@@ -173,7 +173,7 @@ Ext.define('PMG.MainView', {
                    baseCls: 'x-plain',
                    reference: 'usernameinfo',
                    padding: '0 5',
-                   tpl: Ext.String.format(gettext("You are logged in as '{0}'"), '{username}')
+                   tpl: Ext.String.format(gettext("You are logged in as {0}"), "'{username}'")
                },
                {
                    xtype: 'proxmoxHelpButton',

diff --git a/js/QuarantineList.js b/js/QuarantineList.js
index fbd6fad0b5e2ffbcb136dd822c43e7da0736f795..fcfa3b4cc814ce99eb1ea41fdef295d1154fc03d 100644 (file)
--- a/js/QuarantineList.js
+++ b/js/QuarantineList.js
@@ -10,7 +10,7 @@ Ext.define('PMG.QuarantineList', {
 
     config: {
        emailSelection: false,
-       notFoundText: gettext('No data in database.')
+       notFoundText: gettext('No data in database')
     },
 
     statics: {
@@ -215,7 +215,7 @@ Ext.define('PMG.QuarantineList', {
                listConfig: {
                    emptyText:
                        '<div class="x-grid-empty">' +
-                           gettext('No Data in Database') +
+                           gettext('No data in database') +
                        '</div>'
                },
                store: {

diff --git a/js/QuarantineView.js b/js/QuarantineView.js
index fd1e238cde2a70e0f584b4437801fc06f65a4978..52b950def8233c142463e0b3cfa15d984ec989f4 100644 (file)
--- a/js/QuarantineView.js
+++ b/js/QuarantineView.js
@@ -211,7 +211,7 @@ Ext.define('PMG.QuarantineView', {
                    baseCls: 'x-plain',
                    reference: 'usernameinfo',
                    padding: '0 5',
-                   tpl: Ext.String.format(gettext("You are logged in as '{0}'"), '{username}')
+                   tpl: Ext.String.format(gettext("You are logged in as {0}"), "'{username}'")
                },
                {
                    reference: 'logoutButton',

diff --git a/js/ReceiverStatistics.js b/js/ReceiverStatistics.js
index 438db774e94fec8d165a81c504dcf5505b52c0c5..2d7b9e2df4e63aff7a85af500aa5362fbb046483 100644 (file)
--- a/js/ReceiverStatistics.js
+++ b/js/ReceiverStatistics.js
@@ -113,7 +113,7 @@ Ext.define('PMG.ReceiverList', {
     multiColumnSort: true,
     plugins: 'gridfilters',
 
-    emptyText: gettext('No data in database.'),
+    emptyText: gettext('No data in database'),
     viewConfig: {
        deferEmptyText: false
     },

diff --git a/js/RuleInfo.js b/js/RuleInfo.js
index 8e15b20b2287f678323d8e50e18579f8d2b6f3f4..9a9c84b60227bb638e65a48cc92aa3bd3f10df83 100644 (file)
--- a/js/RuleInfo.js
+++ b/js/RuleInfo.js
@@ -251,9 +251,9 @@ Ext.define('PMG.RuleInfo', {
            tpl: [
                '<tpl if="selected">',
                '<b>{name}</b><br><br>',
-               'Priority: {priority}<br>',
-               'Direction: {[PMG.Utils.format_rule_direction(values.direction)]}<br>',
-               'Active: {[Proxmox.Utils.format_boolean(values.active)]}<br>',
+               gettext('Priority') + ': {priority}<br>',
+               gettext('Direction') + ': {[PMG.Utils.format_rule_direction(values.direction)]}<br>',
+               gettext('Active') + ': {[Proxmox.Utils.format_boolean(values.active)]}<br>',
                '<tpl else>',
                gettext('Please select a rule.'),
                '</tpl>'

diff --git a/js/SenderStatistics.js b/js/SenderStatistics.js
index 863700d90bd6262af3354b1d1faa55eabcbb29e3..1cca464bee36f593cfd7fc8d0b7f9f56946c20dd 100644 (file)
--- a/js/SenderStatistics.js
+++ b/js/SenderStatistics.js
@@ -105,7 +105,7 @@ Ext.define('PMG.SenderList', {
     multiColumnSort: true,
     plugins: 'gridfilters',
 
-    emptyText: gettext('No data in database.'),
+    emptyText: gettext('No data in database'),
     viewConfig: {
        deferEmptyText: false
     },

diff --git a/js/SpamQuarantineOptions.js b/js/SpamQuarantineOptions.js
index 0a3cff78a0f1f8c54fd6ff3d01ba9b497e222353..43e45cba4bc99967055c0838d3c85ac9caa01a36 100644 (file)
--- a/js/SpamQuarantineOptions.js
+++ b/js/SpamQuarantineOptions.js
@@ -15,7 +15,7 @@ Ext.define('PMG.SpamQuarantineOptions', {
        none: gettext('No Reports'),
        'short': gettext('Short'),
        verbose: gettext('Verbose'),
-       outlook: gettext('Verbose') + ' (' + gettext('Outlook 2007') + ')',
+       outlook: gettext('Verbose') + ' (Outlook 2007)',
        custom: gettext('Custom')
     },
     

diff --git a/js/UserBlackWhiteList.js b/js/UserBlackWhiteList.js
index c1912423789083e57fa3be706b0505f3246d8167..62c3ed84e18ee5b1eece605f8bfef567d3873a03 100644 (file)
--- a/js/UserBlackWhiteList.js
+++ b/js/UserBlackWhiteList.js
@@ -12,7 +12,7 @@ Ext.define('PMG.UserBlackWhiteList', {
     border: false,
     listname: undefined, // 'blacklist' or 'whitelist',
 
-    emptyText: gettext('No data in database.'),
+    emptyText: gettext('No data in database'),
 
     controller: {
 

diff --git a/js/Utils.js b/js/Utils.js
index dbc3e78f77d84d0cbf4e0d7e1b1a05116d90e048..a9d08226e0cc171309896a83176b7f1cbb4dd070 100644 (file)
--- a/js/Utils.js
+++ b/js/Utils.js
@@ -178,13 +178,13 @@ Ext.define('PMG.Utils', {
            iconCls: 'fa fa-envelope-o',
            xtype: 'proxmoxWindowEdit',
            subdir: 'email',
-           subject: gettext("Email"),
+           subject: gettext("E-Mail"),
            width: 400,
            items: [
                {
                    xtype: 'textfield',
                    name: 'email',
-                   fieldLabel: gettext("Email")
+                   fieldLabel: gettext("E-Mail")
                }
            ]
        },
@@ -192,14 +192,14 @@ Ext.define('PMG.Utils', {
            iconCls: 'fa fa-envelope-o',
            xtype: 'proxmoxWindowEdit',
            subdir: 'receiver',
-           subject: gettext("Email"),
+           subject: gettext("E-Mail"),
            receivertest: true,
            width: 400,
            items: [
                {
                    xtype: 'textfield',
                    name: 'email',
-                   fieldLabel: gettext("Email")
+                   fieldLabel: gettext("E-Mail")
                }
            ]
        },

diff --git a/js/VirusCharts.js b/js/VirusCharts.js
index 071aa4eee94b568fe2c6d70186052d7b0aaaf625..7c94451377b9f85a0ef0d67e95e55d1ceed91120 100644 (file)
--- a/js/VirusCharts.js
+++ b/js/VirusCharts.js
@@ -10,7 +10,7 @@ Ext.define('PMG.VirusCharts', {
 
     tbar: [ { xtype: 'pmgStatTimeSelector' } ],
 
-    emptyText: gettext('No data in database.'),
+    emptyText: gettext('No data in database'),
     viewConfig: {
        deferEmptyText: false
     },

diff --git a/js/VirusQuarantine.js b/js/VirusQuarantine.js
index b33568b01fef4f4a922bf0d3985cb0544473afa5..8a1d46f315391e3558da48eab69f0e35b576f67c 100644 (file)
--- a/js/VirusQuarantine.js
+++ b/js/VirusQuarantine.js
@@ -91,7 +91,7 @@ Ext.define('PMG.VirusQuarantine', {
        {
            title: gettext('Virus Quarantine'),
            xtype: 'pmgQuarantineList',
-           emptyText: gettext('No data in database.'),
+           emptyText: gettext('No data in database'),
            emailSelection: false,
            reference: 'list',
            region: 'west',

diff --git a/js/dashboard/MailProcessing.js b/js/dashboard/MailProcessing.js
index c620c758989b9361359ca2fd6ec736573e8438d0..bc593425ced88a4e75bd9d0f9506ddd2c62a068c 100644 (file)
--- a/js/dashboard/MailProcessing.js
+++ b/js/dashboard/MailProcessing.js
@@ -46,7 +46,7 @@ Ext.define('PMG.dashboard.MailProcessing', {
                'avg_ptime': 0
            },
            tpl: [
-               '<h3><i class="fa fa-clock-o"></i> ' + gettext('Avg. Processing Time') + '</h3>',
+               '<h3><i class="fa fa-clock-o"></i> ' + gettext('Avg. Mail Processing Time') + '</h3>',
                '<p><h2>{avg_ptime}</h2></p>'
            ]
        }