diff --git a/assets/javascripts/discourse/components/repo-status.hbs b/assets/javascripts/discourse/components/repo-status.hbs
index aac98d7..7de38ff 100644
--- a/assets/javascripts/discourse/components/repo-status.hbs
+++ b/assets/javascripts/discourse/components/repo-status.hbs
@@ -19,22 +19,22 @@
{{#if @repo.checkingStatus}}
- Checking for new version...
+ {{i18n "admin.docker.checking"}}
{{else if @repo.upToDate}}
- Up to date
+ {{i18n "admin.docker.up_to_date"}}
{{else}}
-
New Version Available!
+
{{i18n "admin.docker.new_version_available"}}
- Remote Version:
+ {{i18n "admin.docker.latest_version"}}
{{@repo.prettyLatestVersion}}
- Last Updated:
+ {{i18n "admin.docker.last_updated"}}
{{#if @repo.latest.date}}
{{format-date @repo.latest.date}}
{{else}}
diff --git a/assets/javascripts/discourse/components/repo-status.js b/assets/javascripts/discourse/components/repo-status.js
index 3bb9211..8117311 100644
--- a/assets/javascripts/discourse/components/repo-status.js
+++ b/assets/javascripts/discourse/components/repo-status.js
@@ -1,6 +1,7 @@
import Component from "@glimmer/component";
import { inject as service } from "@ember/service";
import { action } from "@ember/object";
+import I18n from "I18n";
export default class RepoStatus extends Component {
@service router;
@@ -30,17 +31,17 @@ export default class RepoStatus extends Component {
get officialRepoBadgeTitle() {
if (this.args.repo.fork) {
- return "Forked Official Plugin";
+ return I18n.t("admin.docker.forked_plugin");
} else if (this.args.repo.official) {
- return "Official Plugin";
+ return I18n.t("admin.docker.official_plugin");
}
}
get upgradeButtonLabel() {
if (this.args.repo.upgrading) {
- return "Currently Upgrading…";
+ return I18n.t("admin.docker.upgrading");
} else {
- return "Upgrade";
+ return I18n.t("admin.docker.upgrade_action");
}
}
diff --git a/assets/javascripts/discourse/components/upgrade-notice.hbs b/assets/javascripts/discourse/components/upgrade-notice.hbs
index b7f9cde..516fdb7 100644
--- a/assets/javascripts/discourse/components/upgrade-notice.hbs
+++ b/assets/javascripts/discourse/components/upgrade-notice.hbs
@@ -1,12 +1,13 @@
{{#if this.currentUser.admin}}
{{#if @versionCheck.upToDate}}
- {{i18n "docker.link_to_upgrade"}}
+ {{i18n "admin.docker.link_to_upgrade"}}
{{else}}
- {{i18n "docker.upgrade"}}
+ {{i18n "admin.docker.outdated_notice"}}
+
- {{i18n "docker.perform_upgrade"}}
+ {{i18n "admin.docker.perform_upgrade"}}
{{/if}}
{{/if}}
diff --git a/assets/javascripts/discourse/controllers/upgrade-show.js b/assets/javascripts/discourse/controllers/upgrade-show.js
index f6db71b..d179b1d 100644
--- a/assets/javascripts/discourse/controllers/upgrade-show.js
+++ b/assets/javascripts/discourse/controllers/upgrade-show.js
@@ -4,6 +4,7 @@ import { inject as service } from "@ember/service";
import { tracked } from "@glimmer/tracking";
import { equal } from "@ember/object/computed";
import { action } from "@ember/object";
+import I18n from "I18n";
export default class UpgradeShow extends Controller {
@service messageBus;
@@ -36,14 +37,6 @@ export default class UpgradeShow extends Controller {
return this.isMultiple ? this.model : [this.model];
}
- get upgradeButtonText() {
- if (this.upgrading) {
- return "Upgrading...";
- } else {
- return "Start Upgrading";
- }
- }
-
updateAttribute(key, value, valueIsKey = false) {
this.model.forEach((repo) => {
value = valueIsKey ? repo[value] : value;
@@ -116,10 +109,7 @@ export default class UpgradeShow extends Controller {
@action
resetUpgrade() {
- const message = `
- WARNING: You should only reset upgrades that have failed and are not running.
- This will NOT cancel currently running builds and should only be used as a last resort.
- `;
+ const message = I18n.t("admin.docker.reset_warning");
this.dialog.confirm({
message,
diff --git a/assets/javascripts/discourse/helpers/new-commits.js b/assets/javascripts/discourse/helpers/new-commits.js
index 034081c..cdd944d 100644
--- a/assets/javascripts/discourse/helpers/new-commits.js
+++ b/assets/javascripts/discourse/helpers/new-commits.js
@@ -1,5 +1,6 @@
import { helper as buildHelper } from "@ember/component/helper";
import { htmlSafe } from "@ember/template";
+import I18n from "I18n";
export default buildHelper(function (params) {
const [commitsBehind, oldSha, newSha, url] = params;
@@ -12,9 +13,9 @@ export default buildHelper(function (params) {
return "";
}
- let description = `${commitsBehind} new commit${
- commitsBehind === 1 ? "" : "s"
- }`;
+ let description = I18n.t("admin.docker.commits", {
+ count: commitsBehind,
+ });
if (!url) {
return description;
diff --git a/assets/javascripts/discourse/templates/upgrade-index.hbs b/assets/javascripts/discourse/templates/upgrade-index.hbs
index 0150778..de88721 100644
--- a/assets/javascripts/discourse/templates/upgrade-index.hbs
+++ b/assets/javascripts/discourse/templates/upgrade-index.hbs
@@ -1,4 +1,4 @@
-Upgrade
+{{i18n "admin.docker.upgrade_title"}}
{{#if allUpToDate}}
- All Up-to-date
+ {{i18n "admin.docker.all_up_to_date"}}
{{else}}
- Upgrade All
+ {{i18n "admin.docker.upgrade_all"}}
{{/if}}
- Repository
- Status
+ {{i18n "admin.docker.repository"}}
+ {{i18n "admin.docker.status"}}
{{#each this.model as |repo|}}
diff --git a/assets/javascripts/discourse/templates/upgrade-show.hbs b/assets/javascripts/discourse/templates/upgrade-show.hbs
index 5e988bb..3de53f8 100644
--- a/assets/javascripts/discourse/templates/upgrade-show.hbs
+++ b/assets/javascripts/discourse/templates/upgrade-show.hbs
@@ -1,27 +1,31 @@
-Upgrade {{this.title}}
+{{i18n "admin.docker.upgrade_repo" name=this.title}}
{{#if this.complete}}
- Upgrade completed successfully!
+ {{i18n "admin.docker.upgrade_successful"}}
{{else if this.failed}}
- Sorry, there was an error upgrading Discourse. Please check the logs below.
+ {{i18n "admin.docker.upgrade_error"}}
{{/if}}
{{#if this.isUpToDate}}
{{#unless this.multiUpgrade}}
- {{this.title}} is at the newest version.
+ {{i18n "admin.docker.repo_newest_version" name=this.title}}
{{else}}
- Everything is up-to-date.
+ {{i18n "admin.docker.everything_up_to_date"}}
{{/unless}}
{{else}}
- {{upgradeButtonText}}
+ {{#if this.upgrading}}
+ {{i18n "admin.docker.upgrading"}}
+ {{else}}
+ {{i18n "admin.docker.start_upgrading"}}
+ {{/if}}
{{#if this.upgrading}}
- Reset Upgrade
+ {{i18n "admin.docker.reset_upgrade"}}
{{/if}}
{{/if}}
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 58c9207..f9cbfdc 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -1,12 +1,37 @@
en:
js:
admin:
+ docker:
+ all_up_to_date: "All Up-to-date"
+ checking: "Checking for new version…"
+ commits:
+ one: "%{count} new commit"
+ other: "%{count} new commits"
+ everything_up_to_date: "Everything is up-to-date"
+ forked_plugin: "Forked Official Plugin"
+ last_updated: "Last Updated:"
+ latest_version: "Latest Version:"
+ link_to_upgrade: "Perform upgrades here"
+ new_version_available: "New Version Available!"
+ official_plugin: "Official Plugin"
+ outdated_notice: "Your Discourse installation is out of date"
+ perform_upgrade: "Click here to upgrade."
+ repo_newest_version: "%{name} is at the newest version."
+ repository: "Repository"
+ reset_upgrade: "Reset Upgrade"
+ reset_warning: "WARNING: You should only reset upgrades that have failed and are not running. This will NOT cancel currently running builds and should only be used as a last resort."
+ start_upgrading: "Start Upgrading"
+ status: "Status"
+ up_to_date: "Up to date"
+ upgrade_action: "Upgrade"
+ upgrade_all: "Upgrade All"
+ upgrade_error: "Sorry, there was an error upgrading Discourse. Please check the logs below."
+ upgrade_repo: "Upgrade %{name}"
+ upgrade_successful: "Upgrade completed successfully!"
+ upgrade_title: "Upgrade"
+ upgrading: "Upgrading…"
+
logs:
staff_actions:
actions:
- discourse_upgrade: "Upgrade to the Latest Version"
-
- docker:
- upgrade: "Your Discourse installation is out of date."
- perform_upgrade: "Click here to upgrade."
- link_to_upgrade: "Perform upgrades here."
+ discourse_upgrade: "Upgrade to the latest version"