{{i18n "admin.docker.upgrade_successful"}}
+{{i18n "admin.docker.update_successful"}}
{{else if this.failed}} -{{i18n "admin.docker.upgrade_error"}}
+{{i18n "admin.docker.update_error"}}
{{/if}} {{#if this.isUpToDate}} @@ -23,15 +23,15 @@ type="button" > {{#if this.upgrading}} - {{i18n "admin.docker.upgrading"}} + {{i18n "admin.docker.updating"}} {{else}} - {{i18n "admin.docker.start_upgrading"}} + {{i18n "admin.docker.start_updating"}} {{/if}} {{#if this.upgrading}} {{/if}} diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index a7fd8be..e827d53 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -18,28 +18,28 @@ en: new_version_available: "New Version Available!" official_plugin: "Official Plugin" outdated_image_header: "You are running an old version of the Discourse image" - outdated_image_info: "Upgrades via the web UI are disabled until you run the latest image. To do so log in to your server using SSH and run:" + outdated_image_info: "Updates via the web UI are disabled until you run the latest image. To do so log in to your server using SSH and run:" outdated_image_link: "More info on our support site" outdated_notice: "Your Discourse installation is out of date." - perform_upgrade: "Click here to upgrade." + perform_update: "Click here to update." 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" + reset_update: "Reset Update" + reset_warning: "WARNING: You should only reset updates that have failed and are not running. This will NOT cancel currently running builds and should only be used as a last resort." + start_updating: "Start Updating" 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_everything: "Upgrade everything" - upgrade_repo: "Upgrade %{name}" - upgrade_successful: "Upgrade completed successfully!" - upgrade_tab: "Upgrade" - upgrade_title: "Upgrade" - upgrading: "Upgrading…" + update_action: "Update" + update_all: "Update All" + update_error: "Sorry, there was an error updating Discourse. Please check the logs below." + update_everything: "Update everything" + update_repo: "Update %{name}" + update_successful: "Update completed successfully!" + update_tab: "Update" + update_title: "Update" + updating: "Updating…" logs: staff_actions: actions: - discourse_upgrade: "Upgrade to the latest version" + discourse_update: "Update to the latest version" diff --git a/config/locales/client.en_GB.yml b/config/locales/client.en_GB.yml index 7aae5c6..efb89cb 100644 --- a/config/locales/client.en_GB.yml +++ b/config/locales/client.en_GB.yml @@ -9,4 +9,4 @@ en_GB: admin: docker: outdated_notice: "Your Discourse installation is out of date." - perform_upgrade: "Click here to upgrade." + perform_update: "Click here to update." diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 3a8d236..7511fbc 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -1,3 +1,3 @@ en: docker_manager: - title: "Discourse upgrade manager" + title: "Discourse update manager" diff --git a/plugin.rb b/plugin.rb index 911cd01..099c8f3 100644 --- a/plugin.rb +++ b/plugin.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true # name: docker_manager -# about: Provides basic monitoring and upgrade facilities to sites using discourse_docker. +# about: Provides basic monitoring and update facilities to sites using discourse_docker. # meta_topic_id: 12655 # version: 1.0.0 # authors: Robin Ward, Sam Saffron diff --git a/scripts/docker_manager_upgrade.rb b/scripts/docker_manager_upgrade.rb index 48e1378..83fd6f1 100644 --- a/scripts/docker_manager_upgrade.rb +++ b/scripts/docker_manager_upgrade.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true -# we fork and let the parent die because we want the upgrade/child process -# to be orphaned and adopted by the init process to prevent the upgrade +# we fork and let the parent die because we want the update/child process +# to be orphaned and adopted by the init process to prevent the update # process from getting killed if/when unicorn gets killed. fork do Process.setsid diff --git a/test/javascripts/acceptance/docker-manager-test.js b/test/javascripts/acceptance/docker-manager-test.js index 9ae46df..94197e2 100644 --- a/test/javascripts/acceptance/docker-manager-test.js +++ b/test/javascripts/acceptance/docker-manager-test.js @@ -80,7 +80,7 @@ acceptance("docker_manager", function (needs) { await click(".upgrade-button"); - assert.dom("h1").hasText("Upgrade discourse"); + assert.dom("h1").hasText("Update discourse"); assert.dom("button.start-upgrade").exists(); }); }); diff --git a/test/javascripts/integration/components/repo-status-test.js b/test/javascripts/integration/components/repo-status-test.js index 84a642d..aa0dc99 100644 --- a/test/javascripts/integration/components/repo-status-test.js +++ b/test/javascripts/integration/components/repo-status-test.js @@ -108,7 +108,7 @@ module("Integration | Component | RepoStatus", function (hooks) { .exists("green check is present when official"); }); - test("upgrade button", async function (assert) { + test("update button", async function (assert) { const store = getOwner(this).lookup("service:store"); this.set("repo", store.createRecord("repo", repoProps)); this.set("managerRepo", store.createRecord("repo", managerProps)); @@ -119,9 +119,9 @@ module("Integration | Component | RepoStatus", function (hooks) { assert .dom(".upgrade-button") - .exists("upgrade button is visible when plugin is out-of-date") + .exists("update button is visible when plugin is out-of-date") .isNotDisabled( - "upgrade button is not disabled when docker_manager repo is out-of-date" + "update button is not disabled when docker_manager repo is out-of-date" ); this.managerRepo.version = "022aa3a"; @@ -130,7 +130,7 @@ module("Integration | Component | RepoStatus", function (hooks) { assert .dom(".upgrade-button") .isDisabled( - "upgrade button is disabled when docker_manager repo is not up-to-date" + "update button is disabled when docker_manager repo is not up-to-date" ); this.repo.latest.commits_behind = 0; @@ -140,6 +140,6 @@ module("Integration | Component | RepoStatus", function (hooks) { assert .dom(".upgrade-button") - .doesNotExist("upgrade button is not visible when plugin is up-to-date"); + .doesNotExist("update button is not visible when plugin is up-to-date"); }); });