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">
-
-
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 @@
- This package has no configuration view
+ This package has no configuration view
+ label="Create package"
+ label-key="packager_createPackage">
@@ -24,7 +25,7 @@
{{ createdPackage.name }}
@@ -34,7 +35,6 @@
button-style="danger"
size="xxs"
label-key="general_delete"
- add-ellipsis="true"
action="vm.deleteCreatedPackage($event, $index, createdPackage)">
@@ -45,7 +45,7 @@
- No packages have been created yet
+ No packages have been created yet
\ 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 @@
-
Upload package
Install a local package by selecting it from your machine. Only install packages from sources you know and trust.
@@ -167,8 +166,6 @@
{{vm.installState.status}}
-
-
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
Notificeringer
+
Oprettet
+
Opret pakke
Vælg pakken fra din computer. Umbraco pakker er oftest en ".zip" fil
Slip her for at uploade
eller klik her for at vælge pakkefil
@@ -815,8 +817,12 @@ Mange hilsner fra Umbraco robotten
Jeg accepterer
betingelser for anvendelse
Installér pakke
-
Afslut
+
Installeret
Installeret pakker
+
Installér lokal
+
Afslut
+
Denne pakke har ingen konfigurationsvisning
+
Der er ikke blevet oprettet nogle pakker endnu
Du har ingen pakker installeret
'Pakker' øverst til højre på din skærm]]>
Søg efter pakker
@@ -953,6 +959,7 @@ Mange hilsner fra Umbraco robotten
Umbraco konfigurationsguide
Mediearkiv
Medlemmer
+
Pakker
Nyhedsbreve
Indstillinger
Statistik
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
Notifications
+
Created
+
Create package
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
I accept
terms of use
Install package
- Finish
+ Installed
Installed packages
+ Install local
+ Finish
+ This package has no configuration view
+ No packages have been created yet
You don’t have any packages installed
'Packages' icon in the top right of your screen]]>
Search for packages
@@ -1212,16 +1218,17 @@ To manage your website, simply open the Umbraco back office and start adding con
Content
Courier
Developer
+ Forms
+ Help
Umbraco Configuration Wizard
Media
Members
Newsletters
+ Packages
Settings
Statistics
Translation
Users
- Help
- Forms
The best Umbraco video tutorials
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 @@
Hide
History
Icon
- Id
+ Id
Import
Info
Inner margin
@@ -657,7 +657,7 @@
Permissions
Scheduled Publishing
Search
- Sorry, we can not find what you are looking for.
+ Sorry, we can not find what you are looking for.
No items have been added
Server
Settings
@@ -1075,6 +1075,8 @@ To manage your website, simply open the Umbraco back office and start adding con
Notifications
+ Created
+ Create package
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
I accept
terms of use
Install package
- Finish
+ Installed
Installed packages
+ Install local
+ Finish
+ This package has no configuration view
+ No packages have been created yet
You don’t have any packages installed
'Packages' icon in the top right of your screen]]>
Search for packages
@@ -1239,13 +1245,13 @@ To manage your website, simply open the Umbraco back office and start adding con
Content
- Packages
+ Forms
Media
Members
+ Packages
Settings
Translation
Users
- Forms
The best Umbraco video tutorials