From a502be606ba331f6e32761eae9d14a981ed1c75b Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Date: Sun, 20 Jan 2019 21:27:32 +0100
Subject: [PATCH] v8: Fix package localization (#4159)

---
 .../src/views/packages/edit.controller.js     |  16 ++-
 .../src/views/packages/edit.html              |   2 -
 .../src/views/packages/options.html           |   2 +-
 .../src/views/packages/overview.controller.js | 119 +++++++++++-------
 .../src/views/packages/views/created.html     |   8 +-
 .../views/packages/views/install-local.html   |   3 -
 .../src/views/users/overview.controller.js    |   3 +-
 src/Umbraco.Web.UI/Umbraco/config/lang/da.xml |   9 +-
 src/Umbraco.Web.UI/Umbraco/config/lang/en.xml |  13 +-
 .../Umbraco/config/lang/en_us.xml             |  16 ++-
 10 files changed, 120 insertions(+), 71 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/packages/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/packages/edit.controller.js
index 0a44192041..282fd0472c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/packages/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/packages/edit.controller.js
@@ -1,7 +1,7 @@
 (function () {
     "use strict";
 
-    function EditController($scope, $location, $routeParams, umbRequestHelper, entityResource, packageResource, editorService, formHelper) {
+    function EditController($scope, $location, $routeParams, umbRequestHelper, entityResource, packageResource, editorService, formHelper, localizationService) {
 
         const vm = this;
 
@@ -23,18 +23,23 @@
         vm.removePackageView = removePackageView;
         vm.downloadFile = downloadFile;
 
+        vm.buttonLabel = "";
+
         const packageId = $routeParams.id;
         const create = $routeParams.create;
 
         function onInit() {
 
-            if(create) {
+            if (create) {
                 //pre populate package with some values
                 packageResource.getEmpty().then(scaffold => {
                     vm.package = scaffold;
                     vm.loading = false;
                 });
-                vm.buttonLabel = "Create";
+
+                localizationService.localize("general_create").then(function(value) {
+                    vm.buttonLabel = value;
+                });
             } else {
                 // load package
                 packageResource.getCreatedById(packageId).then(createdPackage => {
@@ -49,7 +54,10 @@
                     }
 
                 });
-                vm.buttonLabel = "Save";
+
+                localizationService.localize("buttons_save").then(function (value) {
+                    vm.buttonLabel = value;
+                });
             }
 
             // get all doc types
diff --git a/src/Umbraco.Web.UI.Client/src/views/packages/edit.html b/src/Umbraco.Web.UI.Client/src/views/packages/edit.html
index 5ad5ac2522..4c32e7e10c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/packages/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/packages/edit.html
@@ -323,8 +323,6 @@
                                 disabled="vm.loading">
                     </umb-button>
 
-
-
                 </umb-editor-footer-content-right>
 
             </umb-editor-footer>
diff --git a/src/Umbraco.Web.UI.Client/src/views/packages/options.html b/src/Umbraco.Web.UI.Client/src/views/packages/options.html
index d75604d094..f34ac77ac2 100644
--- a/src/Umbraco.Web.UI.Client/src/views/packages/options.html
+++ b/src/Umbraco.Web.UI.Client/src/views/packages/options.html
@@ -19,7 +19,7 @@
                 <umb-load-indicator ng-if="vm.loading"></umb-load-indicator>
 
                 <p ng-if="!vm.package.packageView">
-                    This package has no configuration view
+                    <localize key="packager_noConfigurationView">This package has no configuration view</localize>
                 </p>
 
                 <div ng-if="vm.package.packageView"
diff --git a/src/Umbraco.Web.UI.Client/src/views/packages/overview.controller.js b/src/Umbraco.Web.UI.Client/src/views/packages/overview.controller.js
index e48271aa23..2d5b507bb3 100644
--- a/src/Umbraco.Web.UI.Client/src/views/packages/overview.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/packages/overview.controller.js
@@ -1,7 +1,7 @@
 (function () {
     "use strict";
 
-    function PackagesOverviewController($scope, $location, $routeParams, localStorageService) {
+    function PackagesOverviewController($scope, $location, $routeParams, localizationService, localStorageService) {
 
         //Hack!
         // if there is a local storage value for packageInstallData then we need to redirect there,
@@ -22,56 +22,83 @@
         }
         else {
             var vm = this;
+            vm.page = {};
+            vm.page.labels = {};
+            vm.page.name = "";
+            vm.page.navigation = [];
 
             packageUri = packageInstallData ? packageInstallData : packageUri; //use the path stored in storage over the one in the current path
 
-            vm.page = {};
-            vm.page.name = "Packages";
-            vm.page.navigation = [
-                {
-                    "name": "Packages",
-                    "icon": "icon-cloud",
-                    "view": "views/packages/views/repo.html",
-                    "active": !packageUri || packageUri === "repo",
-                    "alias": "umbPackages",
-                    "action": function () {
-                        $location.path("/packages/packages/repo");
-                    }
-                },
-                {
-                    "name": "Installed",
-                    "icon": "icon-box",
-                    "view": "views/packages/views/installed.html",
-                    "active": packageUri === "installed",
-                    "alias": "umbInstalled",
-                    "action": function () {
-                        $location.path("/packages/packages/installed");
-                    }
-                },
-                {
-                    "name": "Install local",
-                    "icon": "icon-add",
-                    "view": "views/packages/views/install-local.html",
-                    "active": packageUri === "local",
-                    "alias": "umbInstallLocal",
-                    "action": function () {
-                        $location.path("/packages/packages/local");
-                    }
-                },
-                {
-                    "name": "Created",
-                    "icon": "icon-add",
-                    "view": "views/packages/views/created.html",
-                    "active": packageUri === "created",
-                    "alias": "umbCreatedPackages",
-                    "action": function () {
-                        $location.path("/packages/packages/created");
-                    }
-                }
-            ];
-
+            onInit();
         }
 
+        function onInit() {
+
+            loadNavigation();
+
+            setPageName();
+        }
+
+        function loadNavigation() {
+
+            var labels = ["sections_packages", "packager_installed", "packager_installLocal", "packager_created"];
+
+            localizationService.localizeMany(labels).then(function (data) {
+                vm.page.labels.packages = data[0];
+                vm.page.labels.installed = data[1];
+                vm.page.labels.install = data[2];
+                vm.page.labels.created = data[3];
+
+                vm.page.navigation = [
+                    {
+                        "name": vm.page.labels.packages,
+                        "icon": "icon-cloud",
+                        "view": "views/packages/views/repo.html",
+                        "active": !packageUri || packageUri === "repo",
+                        "alias": "umbPackages",
+                        "action": function () {
+                            $location.path("/packages/packages/repo");
+                        }
+                    },
+                    {
+                        "name": vm.page.labels.installed,
+                        "icon": "icon-box",
+                        "view": "views/packages/views/installed.html",
+                        "active": packageUri === "installed",
+                        "alias": "umbInstalled",
+                        "action": function () {
+                            $location.path("/packages/packages/installed");
+                        }
+                    },
+                    {
+                        "name": vm.page.labels.install,
+                        "icon": "icon-add",
+                        "view": "views/packages/views/install-local.html",
+                        "active": packageUri === "local",
+                        "alias": "umbInstallLocal",
+                        "action": function () {
+                            $location.path("/packages/packages/local");
+                        }
+                    },
+                    {
+                        "name": vm.page.labels.created,
+                        "icon": "icon-add",
+                        "view": "views/packages/views/created.html",
+                        "active": packageUri === "created",
+                        "alias": "umbCreatedPackages",
+                        "action": function () {
+                            $location.path("/packages/packages/created");
+                        }
+                    }
+                ];
+            });
+        }
+
+        function setPageName() {
+            localizationService.localize("sections_packages").then(function (data) {
+                vm.page.name = data;
+            })
+        }
     }
 
     angular.module("umbraco").controller("Umbraco.Editors.Packages.OverviewController", PackagesOverviewController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/packages/views/created.html b/src/Umbraco.Web.UI.Client/src/views/packages/views/created.html
index 632d2e2b3c..0da9a966fd 100644
--- a/src/Umbraco.Web.UI.Client/src/views/packages/views/created.html
+++ b/src/Umbraco.Web.UI.Client/src/views/packages/views/created.html
@@ -7,7 +7,8 @@
                 button-style="success"
                 type="button" 
                 action="vm.createPackage()"
-                label="Create package">
+                label="Create package"
+                label-key="packager_createPackage">
             </umb-button>
         </umb-editor-sub-header-content-left>
 
@@ -24,7 +25,7 @@
                     <div class="umb-package-list__item-content">
                         <div class="umb-package-list__item-name">{{ createdPackage.name }}</div>
                         <div class="umb-package-list__item-description">
-                            {{ createdPackage.version }} | <a href="{{ createdPackage.url }}" target="_blank">{{ createdPackage.url }}</a>| {{ createdPackage.author }}
+                            {{ createdPackage.version }} | <a href="{{ createdPackage.url }}" target="_blank">{{ createdPackage.url }}</a> | {{ createdPackage.author }}
                         </div>
                     </div>
                 </td>
@@ -34,7 +35,6 @@
                         button-style="danger"
                         size="xxs"
                         label-key="general_delete"
-                        add-ellipsis="true"
                         action="vm.deleteCreatedPackage($event, $index, createdPackage)">
                     </umb-button>
                 </td>
@@ -45,7 +45,7 @@
     <umb-empty-state
         ng-if="vm.createdPackages.length === 0"
         position="center">
-        No packages have been created yet
+        <localize key="packager_noPackagesCreated">No packages have been created yet</localize>
     </umb-empty-state>
 
 </div>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/packages/views/install-local.html b/src/Umbraco.Web.UI.Client/src/views/packages/views/install-local.html
index b657c42877..6d95bcafa7 100644
--- a/src/Umbraco.Web.UI.Client/src/views/packages/views/install-local.html
+++ b/src/Umbraco.Web.UI.Client/src/views/packages/views/install-local.html
@@ -41,7 +41,6 @@
                     
                 </div>
 
-
                 <h3><strong><localize key="packager_uploadPackage">Upload package</localize></strong></h3>
                 <p class="faded">
                     <localize key="packager_localPackageDescription">Install a local package by selecting it from your machine. Only install packages from sources you know and trust</localize>.
@@ -167,8 +166,6 @@
                                 <p>{{vm.installState.status}}</p>
                             </div>
 
-
-
                             <div class="umb-info-local-item text-info"
                                  ng-show="vm.installCompleted">
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/users/overview.controller.js b/src/Umbraco.Web.UI.Client/src/views/users/overview.controller.js
index 49e8007d8c..80e2322f6b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/overview.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/users/overview.controller.js
@@ -1,7 +1,7 @@
 (function () {
     "use strict";
 
-    function UsersOverviewController($scope, $location, $timeout, navigationService, localizationService) {
+    function UsersOverviewController($scope, $location, localizationService) {
 
         var vm = this;
         var usersUri = $location.search().subview;
@@ -24,7 +24,6 @@
             loadNavigation();
 
             setPageName();
-
         }
 
         function loadNavigation() {
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
index a257fb41d5..0742541484 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
@@ -804,6 +804,8 @@ Mange hilsner fra Umbraco robotten
     <key alias="notifications">Notificeringer</key>
   </area>
   <area alias="packager">
+    <key alias="created">Oprettet</key>
+    <key alias="createPackage">Opret pakke</key>
     <key alias="chooseLocalPackageText">Vælg pakken fra din computer. Umbraco pakker er oftest en ".zip" fil</key>
     <key alias="dropHere">Slip her for at uploade</key>
     <key alias="orClickHereToUpload">eller klik her for at vælge pakkefil</key>
@@ -815,8 +817,12 @@ Mange hilsner fra Umbraco robotten
     <key alias="accept">Jeg accepterer</key>
     <key alias="termsOfUse">betingelser for anvendelse</key>
     <key alias="packageInstall">Installér pakke</key>
-    <key alias="installFinish">Afslut</key>
+    <key alias="installed">Installeret</key>
     <key alias="installedPackages">Installeret pakker</key>
+    <key alias="installLocal">Installér lokal</key>
+    <key alias="installFinish">Afslut</key>
+    <key alias="noConfigurationView">Denne pakke har ingen konfigurationsvisning</key>
+    <key alias="noPackagesCreated">Der er ikke blevet oprettet nogle pakker endnu</key>
     <key alias="noPackages">Du har ingen pakker installeret</key>
     <key alias="noPackagesDescription"><![CDATA[Du har ikke nogen pakker installeret. Du kan enten installere en lokal pakke ved at vælge den fra din computer eller gennemse de tilgængelige pakker ved hjælp af ikonet <strong>'Pakker'</strong> øverst til højre på din skærm]]></key>
     <key alias="packageSearch">Søg efter pakker</key>
@@ -953,6 +959,7 @@ Mange hilsner fra Umbraco robotten
     <key alias="installer">Umbraco konfigurationsguide</key>
     <key alias="media">Mediearkiv</key>
     <key alias="member">Medlemmer</key>
+    <key alias="packages">Pakker</key>
     <key alias="newsletters">Nyhedsbreve</key>
     <key alias="settings">Indstillinger</key>
     <key alias="statistics">Statistik</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
index 42a2c4c844..a057bb060f 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
@@ -1049,6 +1049,8 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="notifications">Notifications</key>
   </area>
   <area alias="packager">
+    <key alias="created">Created</key>
+    <key alias="createPackage">Create package</key>
     <key alias="chooseLocalPackageText"><![CDATA[
       Choose Package from your machine, by clicking the Browse<br />
          button and locating the package. Umbraco packages usually have a ".umb" or ".zip" extension.
@@ -1063,8 +1065,12 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="accept">I accept</key>
     <key alias="termsOfUse">terms of use</key>
     <key alias="packageInstall">Install package</key>
-    <key alias="installFinish">Finish</key>
+    <key alias="installed">Installed</key>
     <key alias="installedPackages">Installed packages</key>
+    <key alias="installLocal">Install local</key>
+    <key alias="installFinish">Finish</key>
+    <key alias="noConfigurationView">This package has no configuration view</key>
+    <key alias="noPackagesCreated">No packages have been created yet</key>
     <key alias="noPackages">You don’t have any packages installed</key>
     <key alias="noPackagesDescription"><![CDATA[You don’t have any packages installed. Either install a local package by selecting it from your machine, or browse through available packages using the <strong>'Packages'</strong> icon in the top right of your screen]]></key>
     <key alias="packageSearch">Search for packages</key>
@@ -1212,16 +1218,17 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="content">Content</key>
     <key alias="courier">Courier</key>
     <key alias="developer">Developer</key>
+    <key alias="forms">Forms</key>
+    <key alias="help" version="7.0">Help</key>
     <key alias="installer">Umbraco Configuration Wizard</key>
     <key alias="media">Media</key>
     <key alias="member">Members</key>
     <key alias="newsletters">Newsletters</key>
+    <key alias="packages">Packages</key>
     <key alias="settings">Settings</key>
     <key alias="statistics">Statistics</key>
     <key alias="translation">Translation</key>
     <key alias="users">Users</key>
-    <key alias="help" version="7.0">Help</key>
-    <key alias="forms">Forms</key>
   </area>
   <area alias="help">
     <key alias="theBestUmbracoVideoTutorials">The best Umbraco video tutorials</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
index be33ee853a..8ce9282d71 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
@@ -606,7 +606,7 @@
     <key alias="hide">Hide</key>
     <key alias="history">History</key>
     <key alias="icon">Icon</key>
-        <key alias="id">Id</key>
+    <key alias="id">Id</key>
     <key alias="import">Import</key>
     <key alias="info">Info</key>
     <key alias="innerMargin">Inner margin</key>
@@ -657,7 +657,7 @@
     <key alias="rights">Permissions</key>
     <key alias="scheduledPublishing">Scheduled Publishing</key>
     <key alias="search">Search</key>
-        <key alias="searchNoResult">Sorry, we can not find what you are looking for.</key>
+    <key alias="searchNoResult">Sorry, we can not find what you are looking for.</key>
     <key alias="noItemsInList">No items have been added</key>
     <key alias="server">Server</key>
     <key alias="settings">Settings</key>
@@ -1075,6 +1075,8 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="notifications">Notifications</key>
   </area>
   <area alias="packager">
+    <key alias="created">Created</key>
+    <key alias="createPackage">Create package</key>
     <key alias="chooseLocalPackageText"><![CDATA[
       Choose Package from your machine, by clicking the Browse<br />
          button and locating the package. Umbraco packages usually have a ".umb" or ".zip" extension.
@@ -1089,8 +1091,12 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="accept">I accept</key>
     <key alias="termsOfUse">terms of use</key>
     <key alias="packageInstall">Install package</key>
-    <key alias="installFinish">Finish</key>
+    <key alias="installed">Installed</key>
     <key alias="installedPackages">Installed packages</key>
+    <key alias="installLocal">Install local</key>
+    <key alias="installFinish">Finish</key>
+    <key alias="noConfigurationView">This package has no configuration view</key>
+    <key alias="noPackagesCreated">No packages have been created yet</key>
     <key alias="noPackages">You don’t have any packages installed</key>
     <key alias="noPackagesDescription"><![CDATA[You don’t have any packages installed. Either install a local package by selecting it from your machine, or browse through available packages using the <strong>'Packages'</strong> icon in the top right of your screen]]></key>
     <key alias="packageSearch">Search for packages</key>
@@ -1239,13 +1245,13 @@ To manage your website, simply open the Umbraco back office and start adding con
   </area>
   <area alias="sections">
     <key alias="content">Content</key>
-    <key alias="packages">Packages</key>
+    <key alias="forms">Forms</key>
     <key alias="media">Media</key>
     <key alias="member">Members</key>
+    <key alias="packages">Packages</key>
     <key alias="settings">Settings</key>
     <key alias="translation">Translation</key>
     <key alias="users">Users</key>
-    <key alias="forms">Forms</key>
   </area>
   <area alias="help">
     <key alias="theBestUmbracoVideoTutorials">The best Umbraco video tutorials</key>