From bf2965dba0a8131b0e45975aea1ed0498d81b634 Mon Sep 17 00:00:00 2001 From: Johannes Zellner Date: Thu, 12 Nov 2020 23:13:52 +0100 Subject: [PATCH] Use new translation argument passing --- src/filemanager.html | 12 ++++++------ src/terminal.html | 4 ++-- src/translation/en.json | 24 ++++++++++++------------ src/views/backups.html | 8 ++++---- src/views/domains.html | 16 ++++++++-------- src/views/emails.html | 12 ++++++------ src/views/emails.js | 4 ---- src/views/network.html | 2 +- src/views/profile.html | 8 ++++---- src/views/profile.js | 9 --------- src/views/services.html | 2 +- src/views/settings.html | 4 ++-- src/views/settings.js | 4 ---- src/views/support.html | 4 ++-- src/views/support.js | 5 ----- src/views/system.html | 4 ++-- 16 files changed, 50 insertions(+), 72 deletions(-) diff --git a/src/filemanager.html b/src/filemanager.html index 0580e4d91..9f984c2d6 100644 --- a/src/filemanager.html +++ b/src/filemanager.html @@ -89,7 +89,7 @@

{{ entryRemove.error }}

-

{{ 'filemanager.removeDialog.reallyDelete' | tr:entryRemove.entry }}

+

{{ 'filemanager.removeDialog.reallyDelete' | tr:{ fileName: entryRemove.entry.fileName } }}

@@ -152,7 +152,7 @@
-

{{ 'filemanager.renameDialog.title' | tr:renameEntry.entry }}

+

{{ 'filemanager.renameDialog.title' | tr:{ fileName: renameEntry.entry.fileName } }}

@@ -177,7 +177,7 @@
-

{{ 'filemanager.chownDialog.title' | tr:chownEntry.entry }}

+

{{ 'filemanager.chownDialog.title' | tr:{ fileName: chownEntry.entry.fileName } }}

@@ -206,7 +206,7 @@
-

{{ 'filemanager.uploadingDialog.title' | tr:uploadStatus }}

+

{{ 'filemanager.uploadingDialog.title' | tr:{ countDone: uploadStatus.countDone, count: uploadStatus.count } }}

@@ -233,7 +233,7 @@
-

{{ 'filemanager.extractDialog.title' | tr:extractStatus }}

+

{{ 'filemanager.extractDialog.title' | tr:{ fileName: extractStatus.fileName } }}

@@ -338,7 +338,7 @@ - {{ entry.fileName }}{{ 'filemanager.list.symlink' | tr:entry }} + {{ entry.fileName }}{{ 'filemanager.list.symlink' | tr:{ target: entry.target } }} {{ entry.size | prettyByteSize }} {{ entry.uid | prettyOwner }} diff --git a/src/terminal.html b/src/terminal.html index 690de7cfb..96acc95df 100644 --- a/src/terminal.html +++ b/src/terminal.html @@ -69,7 +69,7 @@
-

{{ 'terminal.download.title' | tr:selected }}

+

{{ 'terminal.download.title' | tr:{ name: selected.name } }}

@@ -98,7 +98,7 @@
-

{{ 'terminal.upload.title' | tr:selected }}

+

{{ 'terminal.upload.title' | tr:{ name: selected.name } }}

{{ uploadProgress.current | prettyByteSize }} (total {{ uploadProgress.total | prettyByteSize }}) diff --git a/src/translation/en.json b/src/translation/en.json index 5426d4010..e2a1140de 100644 --- a/src/translation/en.json +++ b/src/translation/en.json @@ -86,7 +86,7 @@ }, "loginTokens": { "title": "Login Tokens", - "description": "You have {{ webadminTokens.length }} active web token(s) and {{ cliTokens.length }} CLI token(s).", + "description": "You have {{ webadminTokenCount}} active web token(s) and {{ cliTokenCount }} CLI token(s).", "logoutAll": "Logout From All" }, "changeEmail": { @@ -151,7 +151,7 @@ "contents": "Contents", "version": "Version", "noApps": "No apps", - "appCount": "{{ contents.length }} apps", + "appCount": "{{ appCount }} apps", "tooltipDownloadBackupConfig": "Download Backup Configuration", "cleanupBackups": "Cleanup Backups", "backupNow": "Backup now", @@ -168,7 +168,7 @@ "date": "Date", "version": "Version", "format": "Format", - "list": "References backups of {{ backup.contents.length }} apps" + "list": "References backups of {{ appCount }} apps" }, "backupFailed": { "title": "Unable to create backup" @@ -191,7 +191,7 @@ "provider": "Storage provider", "noopNote": "This option breaks the backup and restore functionality of Cloudron and should only be used for testing. Please make sure the server is completely backed up using alternate means.", "mountPoint": "Mount point", - "mountPointDescription": "The mount point has to be setup manually. See docs.", + "mountPointDescription": "The mount point has to be setup manually. See docs.", "localDirectory": "Local backup directory", "ext4Label": "Backup directory is an external EXT4 Disk", "hardlinksLabel": "Use hardlinks", @@ -244,7 +244,7 @@ "config": "Config", "outbound": "Outbound only", "disabled": "Disabled", - "stats": "{{ mailboxCount }} Mailbox(es) / Usage: {{ usage | prettyByteSize }}", + "stats": "{{ mailboxCount }} Mailbox(es) / Usage: {{ usage }}", "testEmailTooltip": "Send Test Email" }, "settings": { @@ -253,7 +253,7 @@ "location": "Mail server location", "maxMailSize": "Maximum email size", "spamFilter": "Spam filtering", - "spamFilterOverview": "{{ acl.blacklist.length }} address(es) blacklisted {{ customConfig ? '. Custom rules set.' : '.' }}", + "spamFilterOverview": "{{ blacklistCount }} address(es) blacklisted.", "changeDomainProgress": "Changing Email domain:" }, "eventlog": { @@ -287,7 +287,7 @@ "location": "Location", "locationPlaceholder": "Leave empty to use bare domain", "linodeInfo": "Linode DNS average propagation time is 30 minutes. Changing the location will take a while.", - "manualInfo": "Add an A record manually for {{ (!subdomain ? '' : '.') + domain.domain }} to this Cloudron's public IP" + "manualInfo": "Add an A record manually for {{ domain }} to this Cloudron's public IP" }, "changeMailSizeDialog": { "title": "Change Maximum Email Size", @@ -304,7 +304,7 @@ }, "testMailDialog": { "title": "Send test email for {{ domain }}", - "description": "This will send a test email from no-reply@{{domain}} to the address below.", + "description": "This will send a test email from no-reply@{{ domain }} to the address below.", "mailTo": "Email to", "mailToPlaceholder": "Email address", "sendAction": "Send" @@ -324,7 +324,7 @@ "firewall": { "title": "Firewall", "blockedIpRanges": "Blocked IPs & Ranges", - "blocklist": "{{ currentBlocklistLength }} IP(s) blocked", + "blocklist": "{{ blockCount }} IP(s) blocked", "configure": { "title": "Firewall Configuration", "description": "Matched addresses will be unable to connect to the server including the mail server, the dashboard and all apps. Be careful not to lock yourself out.", @@ -351,7 +351,7 @@ "configureActionTooltip": "Configure", "restartActionTooltip": "Restart", "configure": { - "title": "Configure {{ displayName }}", + "title": "Configure {{ name }}", "memoryLimitDescription": "Cloudron allocates 50% of this value as RAM and 50% as swap.", "accessControl": "Access Control", "accessControlDescription": "Allowing non-admins to access SFTP will let them read application config files and secret keys. For some apps like WordPress, they can also log the password.", @@ -375,7 +375,7 @@ }, "timezone": { "title": "Time Zone", - "description": "The current timezone setting is {{ currentTimeZone.display }}.\nThis setting is used for scheduling backup and update tasks." + "description": "The current timezone setting is {{ timeZone }}.\nThis setting is used for scheduling backup and update tasks." }, "updates": { "title": "Updates", @@ -527,7 +527,7 @@ "namecheapInfo": "The server IP needs to be whitelisted for this API Key.", "linodeInfo": "Linode DNS average propagation time is 30 minutes. Installing apps & and getting a Let's Encrypt certificate will take a while.", "manualInfo": "All DNS records have to be setup manually before each app installation.", - "wildcardInfo": "Setup A records for *.{{ newDomain || domain.domain }} and {{ newDomain || domain.domain }} to this server's IP.", + "wildcardInfo": "Setup A records for *.{{ domain }} and {{ domain }} to this server's IP.", "letsEncryptInfo": "Let's Encrypt requires your server to be reachable on port 80", "advancedAction": "Advanced settings...", "zoneName": "Zone Name (Optional)", diff --git a/src/views/backups.html b/src/views/backups.html index 135ce2916..01678d7a7 100644 --- a/src/views/backups.html +++ b/src/views/backups.html @@ -23,7 +23,7 @@
{{ backupDetails.backup.format }}

-

{{ 'backups.backupDetails.list' | tr:backupDetails }}:

+

{{ 'backups.backupDetails.list' | tr:{ appCount: backupDetails.backup.contents.length } }}:

{{ app.label || app.fqdn }}, @@ -134,7 +134,7 @@
-

+

@@ -437,7 +437,7 @@ {{ backup.creationTime | prettyDate }} {{ 'backups.listing.noApps' | tr }} - {{ 'backups.listing.appCount' | tr:backups }} + {{ 'backups.listing.appCount' | tr:{ appCount: backups.contents.length } }} @@ -469,7 +469,7 @@
- +
diff --git a/src/views/domains.html b/src/views/domains.html index b33902022..e7f7dce85 100644 --- a/src/views/domains.html +++ b/src/views/domains.html @@ -22,7 +22,7 @@

{{ 'domains.domainDialog.addTitle' | tr }}

-

{{ 'domains.domainDialog.editTitle' | tr:domainConfigure.domain }}

+

{{ 'domains.domainDialog.editTitle' | tr:{ domain: domainConfigure.domain.domain } }}

@@ -130,10 +130,10 @@

-

-

-

-

+

+

+

+

{{ 'domains.domainDialog.advancedAction' | tr }}
@@ -155,7 +155,7 @@
-

+

@@ -191,10 +191,10 @@
-

{{ 'domains.removeDialog.title' | tr:domainRemove.domain }}

+

{{ 'domains.removeDialog.title' | tr:{ domain: domainRemove.domain.domain } }}

-

+


{{ domainRemove.error }}
diff --git a/src/views/emails.html b/src/views/emails.html index 2a3c6def9..9ff700965 100644 --- a/src/views/emails.html +++ b/src/views/emails.html @@ -32,8 +32,8 @@
-

-

+

+

@@ -108,13 +108,13 @@
-

{{ 'emails.testMailDialog.title' | tr:testEmail.domain }}

+

{{ 'emails.testMailDialog.title' | tr:{ domain: testEmail.domain.domain } }}

{{ testEmail.error.generic }}

-

+


@@ -170,7 +170,7 @@ @@ -214,7 +214,7 @@ {{ 'emails.settings.spamFilter' | tr }}
- {{ 'emails.settings.spamFilterOverview' | tr:spamConfig }} + {{ 'emails.settings.spamFilterOverview' | tr:{ blacklistCount: spamConfig.acl.blacklist.length } }}
diff --git a/src/views/emails.js b/src/views/emails.js index 96fa05796..6986f8cd2 100644 --- a/src/views/emails.js +++ b/src/views/emails.js @@ -10,10 +10,6 @@ angular.module('Application').controller('EmailsController', ['$scope', '$locati $scope.user = Client.getUserInfo(); $scope.domains = []; - $scope.translationLinks = { - linodeDocsLink: 'https://docs.cloudron.io/domains/#linode-dns' - }; - $scope.pageItemCount = [ { name: $translate.instant('main.pagination.perPageSelector', { n: 20 }), value: 20 }, { name: $translate.instant('main.pagination.perPageSelector', { n: 50 }), value: 50 }, diff --git a/src/views/network.html b/src/views/network.html index 2c90021fd..2a3910b45 100644 --- a/src/views/network.html +++ b/src/views/network.html @@ -134,7 +134,7 @@ {{ 'network.firewall.blockedIpRanges' | tr }}
- {{ 'network.firewall.blocklist' | tr:blocklist }} + {{ 'network.firewall.blocklist' | tr:{ blockCount: blocklist.currentBlocklistLength } }}
diff --git a/src/views/profile.html b/src/views/profile.html index 68002d4fb..9444b30e1 100644 --- a/src/views/profile.html +++ b/src/views/profile.html @@ -10,7 +10,7 @@
@@ -175,7 +175,7 @@

-

+

{{ twoFactorAuthentication.secret }}

@@ -426,7 +426,7 @@
-

+

@@ -467,7 +467,7 @@
-

{{ 'profile.loginTokens.description' | tr:tokens }}

+

{{ 'profile.loginTokens.description' | tr:{ webadminTokenCount: tokens.webadminTokens.length, cliTokenCount: cliTokens.length }}


diff --git a/src/views/profile.js b/src/views/profile.js index 4be91f036..89b9f1ba6 100644 --- a/src/views/profile.js +++ b/src/views/profile.js @@ -9,15 +9,6 @@ angular.module('Application').controller('ProfileController', ['$scope', '$trans $scope.config = Client.getConfig(); $scope.apps = Client.getInstalledApps(); - $scope.translationData = { - gravatarLink: 'https://gravatar.com/', - apiDocsLink: 'https://docs.cloudron.io/api.html', - googleAuthenticatorPlayStoreLink: 'https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2', - googleAuthenticatorITunesLink: 'https://itunes.apple.com/us/app/google-authenticator/id388497605', - freeOTPPlayStoreLink: 'https://play.google.com/store/apps/details?id=org.fedorahosted.freeotp', - freeOTPITunesLink: 'https://itunes.apple.com/us/app/freeotp-authenticator/id872559395', - }; - $scope.language; $scope.languages = [ { label: 'English', key: 'en' }, diff --git a/src/views/services.html b/src/views/services.html index 2aca4a73e..f3323195c 100644 --- a/src/views/services.html +++ b/src/views/services.html @@ -3,7 +3,7 @@
-

{{ 'services.configure.title' | tr:serviceConfigure.service }}

+

{{ 'services.configure.title' | tr:{ name: serviceConfigure.service.displayName } }}

diff --git a/src/views/settings.html b/src/views/settings.html index 2c7874aa1..2b01aaa32 100644 --- a/src/views/settings.html +++ b/src/views/settings.html @@ -203,7 +203,7 @@
-

+


{{ timeZone.error }}

@@ -278,7 +278,7 @@
- +
diff --git a/src/views/settings.js b/src/views/settings.js index 18063f039..3212d7fd4 100644 --- a/src/views/settings.js +++ b/src/views/settings.js @@ -14,10 +14,6 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca $scope.subscription = null; $scope.subscriptionBusy = true; - $scope.translationLinks = { - customAppsLink: 'https://docs.cloudron.io/custom-apps/tutorial/' - }; - // values correspond to cron days $scope.cronDays = [ { name: 'Sunday', value: 0 }, diff --git a/src/views/support.html b/src/views/support.html index b3479ef04..eaf73f0cc 100644 --- a/src/views/support.html +++ b/src/views/support.html @@ -12,7 +12,7 @@

{{ 'support.ticket.subscriptionRequired' | tr }}

-

+

@@ -41,7 +41,7 @@
- {{ 'support.ticket.emailInfo' | tr:subscription }} + {{ 'support.ticket.emailInfo' | tr:{ email: subscription.email } }}
diff --git a/src/views/support.js b/src/views/support.js index 0f0c34dec..f4b22b6c7 100644 --- a/src/views/support.js +++ b/src/views/support.js @@ -11,11 +11,6 @@ angular.module('Application').controller('SupportController', ['$scope', '$locat $scope.apps = Client.getInstalledApps(); $scope.supportConfig = null; - $scope.translationLinks = { - supportViewLink: 'https://docs.cloudron.io/apps/?support_view', - forumLink: 'https://forum.cloudron.io/' - }; - $scope.feedback = { error: null, result: null, diff --git a/src/views/system.html b/src/views/system.html index 39f91b43e..be9a9fdae 100644 --- a/src/views/system.html +++ b/src/views/system.html @@ -26,12 +26,12 @@
-

+


-

{{ 'system.diskUsage.diskContent' | tr:disk }}:

+

{{ 'system.diskUsage.diskContent' | tr:{ filesystem: disk.filesystem, mountpoint: disk.mountpoint } }}:

  • {{ content.label }}   {{ content.usage | prettyDiskSize }}