From 9a5f8c2899d17328f80f04dfe419ca38ab5b80db Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Tue, 12 Jan 2016 09:17:39 +0100 Subject: [PATCH 01/30] start localizing content type editor --- .../components/umbgroupsbuilder.directive.js | 6 +- .../compositions/compositions.html | 7 +- .../editorpicker/editorpicker.controller.js | 43 +++++------- .../editorpicker/editorpicker.html | 3 +- .../editorsettings/editorsettings.html | 8 ++- .../views/components/umb-groups-builder.html | 62 ++++++++++++------ .../views/listview/listview.html | 6 +- .../views/templates/templates.html | 4 +- .../mediatypes/views/listview/listview.html | 6 +- src/Umbraco.Web.UI/umbraco/config/lang/en.xml | 65 ++++++++++++++----- 10 files changed, 127 insertions(+), 83 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js index f042138576..336956ff4c 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js @@ -9,7 +9,7 @@ scope.toolbar = []; scope.sortableOptionsGroup = {}; scope.sortableOptionsProperty = {}; - scope.sortingButtonLabel = "Reorder"; + scope.sortingButtonKey = "general_reorder"; function activate() { @@ -200,9 +200,9 @@ scope.sortingMode = !scope.sortingMode; if(scope.sortingMode === true) { - scope.sortingButtonLabel = "I'm done reordering"; + scope.sortingButtonKey = "general_reorderDone"; } else { - scope.sortingButtonLabel = "Reorder"; + scope.sortingButtonKey = "general_reorder"; } }; diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/compositions/compositions.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/compositions/compositions.html index d5cc52b942..d72b91b685 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/compositions/compositions.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/compositions/compositions.html @@ -7,13 +7,14 @@ style="width: 100%" ng-model="searchTerm" class="umb-search-field search-query input-block-level" - placeholder="Filter..." + localize="placeholder" + placeholder="@placeholders_filter" umb-auto-focus>
- Inherit tabs and properties from an existing document type. New tabs will be added to the current document type or merged if a tab with an identical name exists. +
- This content type is used in a composition, and therefore cannot be composed itself. + From e334f669b866673bb580fb5dda24f33ba4c1fd08 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Tue, 12 Jan 2016 10:32:16 +0100 Subject: [PATCH 05/30] localize member types create --- src/Umbraco.Web.UI.Client/src/views/membertypes/create.html | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/membertypes/create.html b/src/Umbraco.Web.UI.Client/src/views/membertypes/create.html index 37f83aea5f..f63cc48771 100644 --- a/src/Umbraco.Web.UI.Client/src/views/membertypes/create.html +++ b/src/Umbraco.Web.UI.Client/src/views/membertypes/create.html @@ -6,12 +6,8 @@ diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/iconpicker/iconpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/iconpicker/iconpicker.html index 842c205b22..462c41c7c9 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/iconpicker/iconpicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/iconpicker/iconpicker.html @@ -14,12 +14,24 @@
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.html index c8b21eae81..aba5818e01 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.html @@ -20,14 +20,22 @@
-
Link to page
+
+ Link to page +
-
Link to media
- Select media +
+ Link to media +
+ + Select media +
- There are no parameters for this macro + There are no parameters for this macro
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.html index b4d65167e7..de055d0299 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.html @@ -92,7 +92,9 @@
-
Preview
+
+ Preview +
-
External login providers
+
+ External login providers +
@@ -45,7 +47,7 @@ name="provider" value="{{login.authType}}"> - Link your {{login.caption}} account + Link your {{login.caption}} account @@ -57,7 +59,7 @@ name="provider" value="{{login.authType}}"> - Un-link your {{login.caption}} account + Un-link your {{login.caption}} account
@@ -76,7 +78,9 @@
-
Change password
+
+ Change password +
{{model.error.data.ExceptionMessage || model.error.data.Message}}

-
Exception Details:
+
+ Exception Details: +
{{model.error.data.ExceptionType}}: {{model.error.data.ExceptionMessage}}
-
Stacktrace:
+
+ Stacktrace: + 
{{model.error.data.StackTrace}}
diff --git a/src/Umbraco.Web.UI/config/trees.config b/src/Umbraco.Web.UI/config/trees.config index 4db3b51c40..42bc28239b 100644 --- a/src/Umbraco.Web.UI/config/trees.config +++ b/src/Umbraco.Web.UI/config/trees.config @@ -3,22 +3,19 @@ - - - + - @@ -27,23 +24,21 @@ - - - - - + + + \ No newline at end of file diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml index cbbab044d9..ec3f2d3c14 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml @@ -239,6 +239,25 @@ Click on the image to see full size Pick item View Cache Item + + Relate to original + The friendliest community + + Link to page + + Opens the linked document in a new window or tab + Opens the linked document in the full body of the window + Opens the linked document in the parent frame + + Link to media + SelectMedia + + There are no parameters for this macro + + External login providers + Exception Details + Stacktrace + Reorder I am done reordering Preview + Change password + + + + Black + Green + Yellow + Orange + Blue + Red + + Background colour Bold From f504a98bcd9a758004bafbc3f8923f6079313919 Mon Sep 17 00:00:00 2001 From: Simon Busborg Date: Tue, 12 Jan 2016 10:42:56 +0100 Subject: [PATCH 07/30] localized placeholders --- .../src/views/common/overlays/copy/copy.html | 2 +- .../src/views/common/overlays/iconpicker/iconpicker.html | 3 ++- .../src/views/common/overlays/itempicker/itempicker.html | 3 ++- .../src/views/common/overlays/mediaPicker/mediapicker.html | 7 ++++++- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/copy/copy.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/copy/copy.html index 04fed9b369..adb57b4af0 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/copy/copy.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/copy/copy.html @@ -33,7 +33,7 @@
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/iconpicker/iconpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/iconpicker/iconpicker.html index 462c41c7c9..e48db80179 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/iconpicker/iconpicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/iconpicker/iconpicker.html @@ -7,7 +7,8 @@ style="width: 100%" ng-model="searchTerm" class="umb-search-field search-query input-block-level" - placeholder="Filter..." + localize="placeholder" + placeholder="@placeholders_filter" umb-auto-focus>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.html index 304df7dd22..be893b8b27 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.html @@ -6,7 +6,8 @@ style="width: 100%" ng-model="searchTerm" class="umb-search-field search-query input-block-level" - placeholder="Filter..." + localize="placeholder" + placeholder="@placeholders_filter" umb-auto-focus /> diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.html index de055d0299..0ab9d6dba4 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.html @@ -12,7 +12,12 @@
- +
From 5965552494d90b50d32698980e3b45d0a694b21b Mon Sep 17 00:00:00 2001 From: Simon Busborg Date: Tue, 12 Jan 2016 11:01:34 +0100 Subject: [PATCH 08/30] localized documenttypes --- .../src/views/documenttypes/delete.html | 11 ++++++++--- .../src/views/documenttypes/move.html | 5 +++-- src/Umbraco.Web.UI/umbraco/config/lang/en.xml | 6 +++++- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/delete.html b/src/Umbraco.Web.UI.Client/src/views/documenttypes/delete.html index 68a193c3ce..b28065ee24 100644 --- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/delete.html +++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/delete.html @@ -17,15 +17,20 @@

- All Documents - using this document type will be deleted permanently, please confirm you want to delete these as well. + + + All Documents + + + using this document type will be deleted permanently, please confirm you want to delete these as well. +

diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/move.html b/src/Umbraco.Web.UI.Client/src/views/documenttypes/move.html index 506db13d06..c982abc0c0 100644 --- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/move.html +++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/move.html @@ -4,7 +4,7 @@

- Select the folder to move {{currentNode.name}} to in the tree structure below + Select the folder to move {{currentNode.name}} to in the tree structure below

@@ -17,7 +17,8 @@
-
{{currentNode.name}} was moved underneath {{target.name}}
+
+ {{currentNode.name}} was moved underneath {{target.name}}
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml index ec3f2d3c14..75ee0e5e16 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml @@ -181,7 +181,6 @@ Choose a type and a title "document types".]]> "media types".]]> - Document Type Without Template Browse your website @@ -258,6 +257,11 @@ Exception Details Stacktrace + Link your + Un-Link your + + account + Date: Tue, 12 Jan 2016 11:38:51 +0100 Subject: [PATCH 09/30] localized documentypes, memberstypes and mediatypes, only controllers missing --- .../src/views/documenttypes/delete.html | 2 +- .../src/views/mediatypes/delete.html | 9 ++++++--- .../src/views/mediatypes/move.html | 6 +++--- .../src/views/membertypes/delete.html | 9 +++++---- .../src/views/membertypes/move.html | 2 +- src/Umbraco.Web.UI/umbraco/config/lang/en.xml | 17 ++++++++++++++++- 6 files changed, 32 insertions(+), 13 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/delete.html b/src/Umbraco.Web.UI.Client/src/views/documenttypes/delete.html index b28065ee24..d0826bf80a 100644 --- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/delete.html +++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/delete.html @@ -30,7 +30,7 @@ diff --git a/src/Umbraco.Web.UI.Client/src/views/mediatypes/delete.html b/src/Umbraco.Web.UI.Client/src/views/mediatypes/delete.html index c051cb5a1e..6d33b6ae0c 100644 --- a/src/Umbraco.Web.UI.Client/src/views/mediatypes/delete.html +++ b/src/Umbraco.Web.UI.Client/src/views/mediatypes/delete.html @@ -15,15 +15,18 @@

- All media items - using this media type will be deleted permanently, please confirm you want to delete these as well. + + + All media items + + using this media type will be deleted permanently, please confirm you want to delete these as well.

diff --git a/src/Umbraco.Web.UI.Client/src/views/mediatypes/move.html b/src/Umbraco.Web.UI.Client/src/views/mediatypes/move.html index 22b6d14d62..59172eb547 100644 --- a/src/Umbraco.Web.UI.Client/src/views/mediatypes/move.html +++ b/src/Umbraco.Web.UI.Client/src/views/mediatypes/move.html @@ -1,10 +1,10 @@
- +

- Select the folder to move {{currentNode.name}} to in the tree structure below + Select the folder to move {{currentNode.name}} to in the tree structure below

@@ -17,7 +17,7 @@
-
{{currentNode.name}} was moved underneath {{target.name}}
+
{{currentNode.name}} was moved underneath {{target.name}}
diff --git a/src/Umbraco.Web.UI.Client/src/views/membertypes/delete.html b/src/Umbraco.Web.UI.Client/src/views/membertypes/delete.html index bfd5e46f70..f1dad26a22 100644 --- a/src/Umbraco.Web.UI.Client/src/views/membertypes/delete.html +++ b/src/Umbraco.Web.UI.Client/src/views/membertypes/delete.html @@ -2,19 +2,20 @@

- Are you sure you want to delete {{currentNode.name}} ? + Are you sure you want to delete {{currentNode.name}} ?

- All members - using this member type will be deleted permanently, please confirm you want to delete these as well. + + All members + using this member type will be deleted permanently, please confirm you want to delete these as well.

diff --git a/src/Umbraco.Web.UI.Client/src/views/membertypes/move.html b/src/Umbraco.Web.UI.Client/src/views/membertypes/move.html index a8e3407f96..0eeadfab80 100644 --- a/src/Umbraco.Web.UI.Client/src/views/membertypes/move.html +++ b/src/Umbraco.Web.UI.Client/src/views/membertypes/move.html @@ -3,7 +3,7 @@

- Select the folder to move {{currentNode.name}} to. + Select the folder to move {{currentNode.name}} to.

diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml index 75ee0e5e16..701f04d52a 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml @@ -431,7 +431,7 @@ Show page on Send Size Sort - Submit + Submit Type Type to search... Up @@ -452,6 +452,7 @@ I am done reordering Preview Change password + to @@ -995,9 +996,23 @@ To manage your website, simply open the Umbraco back office and start adding con Configuration + Yes, delete + + was moved underneath + Select the folder to move + to in the tree structure below + All Document types + All Documents + All media items + using this document type will be deleted permanently, please confirm you want to delete these as well. + using this media type will be deleted permanently, please confirm you want to delete these as well. + using this member type will be deleted permanently, please confirm you want to delete these as well + and all documents using this type + and all media items using this type + and all members using this type From 3888853a40cdc0ea7b7c34f9a70cb2c99f4a41e1 Mon Sep 17 00:00:00 2001 From: Simon Busborg Date: Tue, 12 Jan 2016 13:22:00 +0100 Subject: [PATCH 10/30] Added localization to controllers --- .../views/documenttypes/create.controller.js | 16 +++++++--- .../src/views/mediatypes/create.controller.js | 10 ++++-- .../views/membertypes/create.controller.js | 10 ++++-- src/Umbraco.Web.UI/umbraco/config/lang/en.xml | 31 ++++++++++--------- 4 files changed, 43 insertions(+), 24 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.controller.js index a62024e704..d9abee4e43 100644 --- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.controller.js @@ -6,11 +6,11 @@ * @description * The controller for the doc type creation dialog */ -function DocumentTypesCreateController($scope, $location, navigationService, contentTypeResource, formHelper, appState, notificationsService) { +function DocumentTypesCreateController($scope, $location, navigationService, contentTypeResource, formHelper, appState, notificationsService, localizationService) { $scope.model = { folderName: "", - creatingFolder: false, + creatingFolder: false, }; var node = $scope.dialogOptions.currentNode; @@ -20,7 +20,13 @@ function DocumentTypesCreateController($scope, $location, navigationService, con } $scope.createContainer = function () { - if (formHelper.submitForm({ scope: $scope, formCtrl: this.createFolderForm, statusMessage: "Creating folder..." })) { + var localizeCreateFolder = localizationService.localize("defaultdialog_createFolder").then(function (value) {return value;}) + + if (formHelper.submitForm({ + scope: $scope, + formCtrl: this.createFolderForm, + statusMessage: localizeCreateFolder + })) { contentTypeResource.createContainer(node.id, $scope.model.folderName).then(function (folderId) { navigationService.hideMenu(); @@ -29,8 +35,8 @@ function DocumentTypesCreateController($scope, $location, navigationService, con formHelper.resetForm({ scope: $scope }); - var section = appState.getSectionState("currentSection"); - + var section = appState.getSectionState("currentSection"); + }, function(err) { $scope.error = err; diff --git a/src/Umbraco.Web.UI.Client/src/views/mediatypes/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/mediatypes/create.controller.js index 44f615ac7f..aa1e32a5b1 100644 --- a/src/Umbraco.Web.UI.Client/src/views/mediatypes/create.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/mediatypes/create.controller.js @@ -6,7 +6,7 @@ * @description * The controller for the media type creation dialog */ -function MediaTypesCreateController($scope, $location, navigationService, mediaTypeResource, formHelper, appState) { +function MediaTypesCreateController($scope, $location, navigationService, mediaTypeResource, formHelper, appState, localizationService) { $scope.model = { folderName: "", @@ -20,7 +20,13 @@ function MediaTypesCreateController($scope, $location, navigationService, mediaT } $scope.createContainer = function () { - if (formHelper.submitForm({ scope: $scope, formCtrl: this.createFolderForm, statusMessage: "Creating folder..." })) { + var localizeCreateFolder = localizationService.localize("defaultdialog_createFolder").then(function (value) {return value;}) + + if (formHelper.submitForm({ + scope: $scope, + formCtrl: this.createFolderForm, + statusMessage: localizeCreateFolder + })) { mediaTypeResource.createContainer(node.id, $scope.model.folderName).then(function (folderId) { navigationService.hideMenu(); diff --git a/src/Umbraco.Web.UI.Client/src/views/membertypes/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/membertypes/create.controller.js index 2e2d274fe1..1678f08836 100644 --- a/src/Umbraco.Web.UI.Client/src/views/membertypes/create.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/membertypes/create.controller.js @@ -6,7 +6,7 @@ * @description * The controller for the member type creation dialog */ -function MemberTypesCreateController($scope, $location, navigationService, memberTypeResource, formHelper, appState) { +function MemberTypesCreateController($scope, $location, navigationService, memberTypeResource, formHelper, appState, localizationService) { $scope.model = { folderName: "", @@ -20,7 +20,13 @@ function MemberTypesCreateController($scope, $location, navigationService, membe } $scope.createContainer = function () { - if (formHelper.submitForm({ scope: $scope, formCtrl: this.createFolderForm, statusMessage: "Creating folder..." })) { + var localizeCreateFolder = localizationService.localize("defaultdialog_createFolder").then(function (value) {return value;}) + + if (formHelper.submitForm({ + scope: $scope, + formCtrl: this.createFolderForm, + statusMessage: localizeCreateFolder + })) { memberTypeResource.createContainer(node.id, $scope.model.folderName).then(function (folderId) { navigationService.hideMenu(); diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml index 701f04d52a..a2e6cd3e6c 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml @@ -238,29 +238,30 @@ Click on the image to see full size Pick item View Cache Item + Create folder... - Relate to original - The friendliest community + Relate to original + The friendliest community - Link to page + Link to page - Opens the linked document in a new window or tab - Opens the linked document in the full body of the window - Opens the linked document in the parent frame + Opens the linked document in a new window or tab + Opens the linked document in the full body of the window + Opens the linked document in the parent frame - Link to media - SelectMedia + Link to media + SelectMedia - There are no parameters for this macro + There are no parameters for this macro - External login providers - Exception Details - Stacktrace + External login providers + Exception Details + Stacktrace - Link your - Un-Link your + Link your + Un-Link your - account + account From cc1764dc88945492ae80bd0145e722e45bc7560b Mon Sep 17 00:00:00 2001 From: Simon Busborg Date: Tue, 12 Jan 2016 15:37:01 +0100 Subject: [PATCH 11/30] Added localization for controllers (member, media and document types) --- .../common/services/localization.service.js | 4 +- .../views/documenttypes/create.controller.js | 5 +-- .../views/documenttypes/edit.controller.js | 39 ++++++++++--------- .../src/views/mediatypes/create.controller.js | 5 +-- .../src/views/mediatypes/edit.controller.js | 33 ++++++++-------- .../views/membertypes/create.controller.js | 6 +-- .../src/views/membertypes/edit.controller.js | 14 ++++--- src/Umbraco.Web.UI/umbraco/config/lang/en.xml | 22 ++++++++++- 8 files changed, 75 insertions(+), 53 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/services/localization.service.js b/src/Umbraco.Web.UI.Client/src/common/services/localization.service.js index 027a055bba..55b61e06fa 100644 --- a/src/Umbraco.Web.UI.Client/src/common/services/localization.service.js +++ b/src/Umbraco.Web.UI.Client/src/common/services/localization.service.js @@ -105,7 +105,7 @@ angular.module('umbraco.services') return deferred.promise; }, - + }; // force the load of the resource file @@ -119,4 +119,4 @@ angular.module('umbraco.services') // return the local instance when called return service; -}); \ No newline at end of file +}); diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.controller.js index d9abee4e43..84e490dd6e 100644 --- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.controller.js @@ -13,15 +13,14 @@ function DocumentTypesCreateController($scope, $location, navigationService, con creatingFolder: false, }; - var node = $scope.dialogOptions.currentNode; + var node = $scope.dialogOptions.currentNode, + localizeCreateFolder = localizationService.localize("defaultdialog_createFolder").then(function (value) {return value;}); $scope.showCreateFolder = function() { $scope.model.creatingFolder = true; } $scope.createContainer = function () { - var localizeCreateFolder = localizationService.localize("defaultdialog_createFolder").then(function (value) {return value;}) - if (formHelper.submitForm({ scope: $scope, formCtrl: this.createFolderForm, diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js index 72eef7bd58..72da692bbf 100644 --- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js @@ -12,6 +12,7 @@ function DocumentTypesEditController($scope, $routeParams, modelsResource, contentTypeResource, dataTypeResource, editorState, contentEditingHelper, formHelper, navigationService, iconHelper, contentTypeHelper, notificationsService, $filter, $q, localizationService, overlayHelper) { var vm = this; + var localizeSaving = localizationService.localize("general_saving").then(function (value) {return value;}); vm.save = save; @@ -22,23 +23,23 @@ vm.page.saveButtonState = "init"; vm.page.navigation = [ { - "name": "Design", + "name": localizationService.localize("general_design").then(function (value) {return value;}), "icon": "icon-document-dashed-line", "view": "views/documenttypes/views/design/design.html", "active": true }, { - "name": "List view", + "name": localizationService.localize("general_listView").then(function (value) {return value;}), "icon": "icon-list", "view": "views/documenttypes/views/listview/listview.html" }, { - "name": "Permissions", + "name": localizationService.localize("general_rights").then(function (value) {return value;}), "icon": "icon-keychain", "view": "views/documenttypes/views/permissions/permissions.html" }, { - "name": "Templates", + "name": localizationService.localize("treeHeaders_templates").then(function (value) {return value;}), "icon": "icon-layout", "view": "views/documenttypes/views/templates/templates.html" } @@ -46,63 +47,63 @@ vm.page.keyboardShortcutsOverview = [ { - "name": "Sections", + "name": localizationService.localize("main_sections").then(function (value) {return value;}), "shortcuts": [ { - "description": "Navigate sections", + "description": localizationService.localize("shortcuts_navigateSections").then(function (value) {return value;}), "keys": [{ "key": "1" }, { "key": "4" }], "keyRange": true } ] }, { - "name": "Design", + "name": localizationService.localize("general_design").then(function (value) {return value;}), "shortcuts": [ { - "description": "Add tab", + "description": localizationService.localize("shortcuts_addTab").then(function (value) {return value;}), "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "t" }] }, { - "description": "Add property", + "description": localizationService.localize("shortcuts_addProperty").then(function (value) {return value;}), "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "p" }] }, { - "description": "Add editor", + "description": localizationService.localize("shortcuts_addEditor").then(function (value) {return value;}), "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "e" }] }, { - "description": "Edit data type", + "description": localizationService.localize("shortcuts_editDataType").then(function (value) {return value;}), "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "d" }] } ] }, { - "name": "List view", + "name": localizationService.localize("general_listView").then(function (value) {return value;}), "shortcuts": [ { - "description": "Toggle list view", + "description": localizationService.localize("shortcuts_toggleListView").then(function (value) {return value;}), "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "l" }] } ] }, { - "name": "Permissions", + "name": localizationService.localize("general_rights").then(function (value) {return value;}), "shortcuts": [ { - "description": "Toggle allow as root", + "description": localizationService.localize("shortcuts_toggleAllowAsRoot").then(function (value) {return value;}), "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "r" }] }, { - "description": "Add child node", + "description": localizationService.localize("shortcuts_addChildNode").then(function (value) {return value;}), "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "c" }] } ] }, { - "name": "Templates", + "name": localizationService.localize("treeHeaders_templates").then(function (value) {return value;}), "shortcuts": [ { - "description": "Add template", + "description": localizationService.localize("shortcuts_addTemplate").then(function (value) {return value;}), "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "t" }] } ] @@ -151,7 +152,7 @@ vm.contentType.allowedContentTypes = contentTypeHelper.createIdArray(vm.contentType.allowedContentTypes); contentEditingHelper.contentEditorPerformSave({ - statusMessage: "Saving...", + statusMessage: localizeSaving, saveMethod: contentTypeResource.save, scope: $scope, content: vm.contentType, diff --git a/src/Umbraco.Web.UI.Client/src/views/mediatypes/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/mediatypes/create.controller.js index aa1e32a5b1..873339d653 100644 --- a/src/Umbraco.Web.UI.Client/src/views/mediatypes/create.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/mediatypes/create.controller.js @@ -13,15 +13,14 @@ function MediaTypesCreateController($scope, $location, navigationService, mediaT creatingFolder: false }; - var node = $scope.dialogOptions.currentNode; + var node = $scope.dialogOptions.currentNode, + localizeCreateFolder = localizationService.localize("defaultdialog_createFolder").then(function (value) {return value;}); $scope.showCreateFolder = function() { $scope.model.creatingFolder = true; } $scope.createContainer = function () { - var localizeCreateFolder = localizationService.localize("defaultdialog_createFolder").then(function (value) {return value;}) - if (formHelper.submitForm({ scope: $scope, formCtrl: this.createFolderForm, diff --git a/src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.controller.js index 5dd074b504..723d5309d9 100644 --- a/src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.controller.js @@ -11,6 +11,7 @@ function MediaTypesEditController($scope, $routeParams, mediaTypeResource, dataTypeResource, editorState, contentEditingHelper, formHelper, navigationService, iconHelper, contentTypeHelper, notificationsService, $filter, $q, localizationService, overlayHelper) { var vm = this; + var localizeSaving = localizationService.localize("general_saving").then(function (value) {return value;}); vm.save = save; @@ -21,18 +22,18 @@ vm.page.saveButtonState = "init"; vm.page.navigation = [ { - "name": "Design", + "name": localizationService.localize("general_design").then(function (value) {return value;}), "icon": "icon-document-dashed-line", "view": "views/mediatypes/views/design/design.html", "active": true }, { - "name": "List view", + "name": localizationService.localize("general_listView").then(function (value) {return value;}), "icon": "icon-list", "view": "views/mediatypes/views/listview/listview.html" }, { - "name": "Permissions", + "name": localizationService.localize("general_rights").then(function (value) {return value;}), "icon": "icon-keychain", "view": "views/mediatypes/views/permissions/permissions.html" } @@ -40,54 +41,54 @@ vm.page.keyboardShortcutsOverview = [ { - "name": "Sections", + "name": localizationService.localize("main_sections").then(function (value) {return value;}), "shortcuts": [ { - "description": "Navigate sections", + "description": localizationService.localize("shortcuts_navigateSections").then(function (value) {return value;}), "keys": [{ "key": "1" }, { "key": "3" }], "keyRange": true } ] }, { - "name": "Design", + "name": localizationService.localize("general_design").then(function (value) {return value;}), "shortcuts": [ { - "description": "Add tab", + "description": localizationService.localize("shortcuts_addTab").then(function (value) {return value;}), "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "t" }] }, { - "description": "Add property", + "description": localizationService.localize("shortcuts_addProperty").then(function (value) {return value;}), "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "p" }] }, { - "description": "Add editor", + "description": localizationService.localize("shortcuts_addEditor").then(function (value) {return value;}), "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "e" }] }, { - "description": "Edit data type", + "description": localizationService.localize("shortcuts_editDataType").then(function (value) {return value;}), "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "d" }] } ] }, { - "name": "List view", + "name": localizationService.localize("general_listView").then(function (value) {return value;}), "shortcuts": [ { - "description": "Toggle list view", + "description": localizationService.localize("shortcuts_toggleListView").then(function (value) {return value;}), "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "l" }] } ] }, { - "name": "Permissions", + "name": localizationService.localize("general_rights").then(function (value) {return value;}), "shortcuts": [ { - "description": "Toggle allow as root", + "description": localizationService.localize("shortcuts_toggleAllowAsRoot").then(function (value) {return value;}), "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "r" }] }, { - "description": "Add child node", + "description": localizationService.localize("shortcuts_addChildNode").then(function (value) {return value;}), "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "c" }] } ] @@ -132,7 +133,7 @@ vm.contentType.allowedContentTypes = contentTypeHelper.createIdArray(vm.contentType.allowedContentTypes); contentEditingHelper.contentEditorPerformSave({ - statusMessage: "Saving...", + statusMessage: localizeSaving, saveMethod: mediaTypeResource.save, scope: $scope, content: vm.contentType, diff --git a/src/Umbraco.Web.UI.Client/src/views/membertypes/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/membertypes/create.controller.js index 1678f08836..2fb9b6b69f 100644 --- a/src/Umbraco.Web.UI.Client/src/views/membertypes/create.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/membertypes/create.controller.js @@ -13,15 +13,15 @@ function MemberTypesCreateController($scope, $location, navigationService, membe creatingFolder: false }; - var node = $scope.dialogOptions.currentNode; + var node = $scope.dialogOptions.currentNode, + localizeCreateFolder = localizationService.localize("defaultdialog_createFolder").then(function (value) {return value;}); + $scope.showCreateFolder = function() { $scope.model.creatingFolder = true; } $scope.createContainer = function () { - var localizeCreateFolder = localizationService.localize("defaultdialog_createFolder").then(function (value) {return value;}) - if (formHelper.submitForm({ scope: $scope, formCtrl: this.createFolderForm, diff --git a/src/Umbraco.Web.UI.Client/src/views/membertypes/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/membertypes/edit.controller.js index 3a1d91d2f0..ab69bfdfda 100644 --- a/src/Umbraco.Web.UI.Client/src/views/membertypes/edit.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/membertypes/edit.controller.js @@ -12,6 +12,7 @@ function MemberTypesEditController($scope, $rootScope, $routeParams, $log, $filter, memberTypeResource, dataTypeResource, editorState, iconHelper, formHelper, navigationService, contentEditingHelper, notificationsService, $q, localizationService, overlayHelper) { var vm = this; + var localizeSaving = localizationService.localize("general_saving").then(function (value) {return value;}); vm.save = save; @@ -22,7 +23,7 @@ vm.page.saveButtonState = "init"; vm.page.navigation = [ { - "name": "Design", + "name": localizationService.localize("general_design").then(function (value) {return value;}), "icon": "icon-document-dashed-line", "view": "views/membertypes/views/design/design.html", "active": true @@ -31,21 +32,22 @@ vm.page.keyboardShortcutsOverview = [ { + "name": localizationService.localize("shortcuts_shortcut").then(function (value) {return value;}), "shortcuts": [ { - "description": "Add tab", + "description": localizationService.localize("shortcuts_addTab").then(function (value) {return value;}), "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "t" }] }, { - "description": "Add property", + "description": localizationService.localize("shortcuts_addProperty").then(function (value) {return value;}), "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "p" }] }, { - "description": "Add editor", + "description": localizationService.localize("shortcuts_addEditor").then(function (value) {return value;}), "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "e" }] }, { - "description": "Edit data type", + "description": localizationService.localize("shortcuts_editDataType").then(function (value) {return value;}), "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "d" }] } ] @@ -86,7 +88,7 @@ vm.page.saveButtonState = "busy"; contentEditingHelper.contentEditorPerformSave({ - statusMessage: "Saving...", + statusMessage: localizeSaving, saveMethod: memberTypeResource.save, scope: $scope, content: vm.contentType, diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml index a2e6cd3e6c..bdcbb2e935 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml @@ -181,6 +181,7 @@ Choose a type and a title "document types".]]> "media types".]]> + Document Type without a template Browse your website @@ -454,7 +455,8 @@ Preview Change password to - + List view + Saving... @@ -466,6 +468,23 @@ Red + + Add tab + Add property + Add editor + Add template + Add child node + + Edit data type + + Navigate sections + + Shortcuts + + Toggle list view + Toggle allow as root + + Background colour Bold @@ -473,6 +492,7 @@ Font Text + Page From c9ad7659a8b804cff9846ddc3187591ce51557b8 Mon Sep 17 00:00:00 2001 From: Simon Busborg Date: Wed, 13 Jan 2016 11:02:40 +0100 Subject: [PATCH 12/30] localize components views --- .../src/views/components/umb-child-selector.html | 6 ++++-- .../src/views/components/umb-content-grid.html | 2 +- .../src/views/components/umb-grid-selector.html | 10 +++++----- .../components/umb-keyboard-shortcuts-overview.html | 2 +- .../src/views/components/umb-list-view-settings.html | 10 +++++----- .../src/views/components/umb-locked-field.html | 4 ++-- src/Umbraco.Web.UI/umbraco/config/lang/en.xml | 10 ++++++++++ 7 files changed, 28 insertions(+), 16 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-child-selector.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-child-selector.html index c6a9be19c0..25f6c25a2f 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/umb-child-selector.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-child-selector.html @@ -8,7 +8,9 @@ {{ parentName }} - (Current) + + (Current) +
@@ -27,7 +29,7 @@
-
Add child
+
Add Child
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-content-grid.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-content-grid.html index 6c61558ae3..28544e81f6 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/umb-content-grid.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-content-grid.html @@ -29,7 +29,7 @@ - There are no items to show + There are no items to show
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-grid-selector.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-grid-selector.html index b269972e96..9d1e0b4b0a 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/umb-grid-selector.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-grid-selector.html @@ -6,7 +6,7 @@
{{ defaultItem.name }}
- (Default {{itemLabel}}) + (Default {{itemLabel}})
@@ -15,22 +15,22 @@
{{ selectedItem.name }}
- Set as default + Set as default
-
Choose extra {{ itemLabel }}
-
Choose default {{ itemLabel }}
+
Choose extra {{ itemLabel }}
+
Choose default{{ itemLabel }}
- All {{itemLabel}}s are added + Akk {{itemLabel}}s are added
-
show shortcuts
+
show shortcuts
alt
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-list-view-settings.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-list-view-settings.html index 39b604aa1d..b14ef2ff84 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/umb-list-view-settings.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-list-view-settings.html @@ -14,11 +14,11 @@
-
{{ dataType.name }} (default)
+
{{ dataType.name }} (default)
- Create custom list view - Remove custom list view + Create custom list view + Remove custom list view
@@ -31,8 +31,8 @@ - - + +
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-locked-field.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-locked-field.html index 0ae19777f1..744e635f21 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/umb-locked-field.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-locked-field.html @@ -25,8 +25,8 @@
-
Required alias
-
Invalid alias
+
Required alias
+
Invalid alias
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml index bdcbb2e935..b113b8211f 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml @@ -134,6 +134,7 @@ This item has been changed after publication This item is not published Last published + There are no items to show There are no items to show in the list. Media Type Link to media item(s) @@ -357,6 +358,7 @@ Actions Add Alias + All Are you sure? Border by @@ -394,6 +396,7 @@ Inner margin Insert Install + Invalid Justify Language Layout @@ -457,6 +460,7 @@ to List view Saving... + current @@ -474,12 +478,14 @@ Add editor Add template Add child node + Add child Edit data type Navigate sections Shortcuts + show shortcuts Toggle list view Toggle allow as root @@ -981,6 +987,10 @@ To manage your website, simply open the Umbraco back office and start adding con Allow all editors Allow all row configurations + Set as default + Choose extra + Choose default + are added From 67112b640c4b71e4cbb2a1b237ff6238ac82d8bd Mon Sep 17 00:00:00 2001 From: Simon Busborg Date: Wed, 13 Jan 2016 11:14:15 +0100 Subject: [PATCH 13/30] localized component views --- .../src/views/components/editor/umb-editor-header.html | 4 +++- .../src/views/components/upload/umb-file-dropzone.html | 6 +++--- src/Umbraco.Web.UI/umbraco/config/lang/en.xml | 1 + 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html index a6e2c4fefd..8a5feafc97 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html @@ -8,7 +8,9 @@
-
Add icon
+
+ +
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/upload/umb-file-dropzone.html b/src/Umbraco.Web.UI.Client/src/views/components/upload/umb-file-dropzone.html index 7d3c92b47b..7c156d1095 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/upload/umb-file-dropzone.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/upload/umb-file-dropzone.html @@ -30,7 +30,7 @@ ngf-multiple="true" ngf-pattern="{{ accept }}" ngf-max-size="{{ maxFileSize }}"> - - or click here to choose files + - or click here to choose files
@@ -78,8 +78,8 @@ {{ file.name }} - (Only allowed file types are: "{{ accept }}") - (Max file size is "{{maxFileSize}}") + (: "{{ accept }}") + ( "{{maxFileSize}}") diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml index b113b8211f..f1a89c0934 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml @@ -858,6 +858,7 @@ To manage your website, simply open the Umbraco back office and start adding con No properties defined on this tab. Click on the "add a new property" link at the top to create a new property. Master Document Type Create matching template + Add icon Sorting complete. From cdcadab68b8e4b19e17221c8f40363e3377ec4ae Mon Sep 17 00:00:00 2001 From: Simon Busborg Date: Wed, 13 Jan 2016 13:28:47 +0100 Subject: [PATCH 14/30] localize overlay titles --- .../editorpicker/editorpicker.controller.js | 4 ++++ .../propertysettings.controller.js | 1 - .../common/overlays/copy/copy.controller.js | 4 ++++ .../common/overlays/embed/embed.controller.js | 7 +++++-- .../common/overlays/help/help.controller.js | 10 ++++------ .../iconpicker/iconpicker.controller.js | 10 ++++++---- .../itempicker/itempicker.controller.js | 18 ++++++++++++------ .../linkpicker/linkpicker.controller.js | 6 +++--- .../macropicker/macropicker.controller.js | 7 +++++-- .../mediaPicker/mediapicker.controller.js | 6 +++++- .../membergrouppicker.controller.js | 6 +++++- .../common/overlays/move/move.controller.js | 4 ++++ .../treepicker/treepicker.controller.js | 9 +++++++++ .../common/overlays/user/user.controller.js | 4 ++++ .../common/overlays/ysod/ysod.controller.js | 4 ++-- src/Umbraco.Web.UI/umbraco/config/lang/en.xml | 16 +++++++++++++++- 16 files changed, 87 insertions(+), 29 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/editorpicker/editorpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/editorpicker/editorpicker.controller.js index 4c2c281c1e..01ba9b128f 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/editorpicker/editorpicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/editorpicker/editorpicker.controller.js @@ -14,6 +14,10 @@ var vm = this; + if(!$scope.model.title) { + $scope.model.title = localizationService.localize("defaultdialogs_selectEditor").then(function (value) {return value;}); + } + vm.searchTerm = ""; vm.showTabs = false; vm.tabsLoaded = 0; diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/propertysettings/propertysettings.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/propertysettings/propertysettings.controller.js index 70fc5665fb..c41c6261a1 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/propertysettings/propertysettings.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/propertysettings/propertysettings.controller.js @@ -65,7 +65,6 @@ vm.focusOnMandatoryField = false; vm.editorPickerOverlay = {}; - vm.editorPickerOverlay.title = "Choose editor"; vm.editorPickerOverlay.property = $scope.model.property; vm.editorPickerOverlay.contentTypeName = $scope.model.contentTypeName; vm.editorPickerOverlay.view = "views/common/overlays/contenttypeeditor/editorpicker/editorpicker.html"; diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/copy/copy.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/copy/copy.controller.js index 1476b852f2..6b31fc17d9 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/copy/copy.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/copy/copy.controller.js @@ -5,6 +5,10 @@ var vm = this; + if(!$scope.model.title) { + $scope.model.title = localizationService.localize("general_copy").then(function (value) {return value;}); + } + vm.hideSearch = hideSearch; vm.selectResult = selectResult; vm.onSearchResults = onSearchResults; diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/embed/embed.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/embed/embed.controller.js index 20568c8ae5..e912758f0d 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/embed/embed.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/embed/embed.controller.js @@ -1,13 +1,16 @@ (function() { "use strict"; - function EmbedOverlay($scope, $http, umbRequestHelper) { + function EmbedOverlay($scope, $http, umbRequestHelper, localizationService) { var vm = this; var origWidth = 500; var origHeight = 300; - $scope.model.title = "Embed"; + if(!$scope.model.title) { + $scope.model.title = localizationService.localize("general_embed").then(function (value) {return value;}); + } + $scope.model.embed = { url: "", width: 360, diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/help/help.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/help/help.controller.js index 13b2f4edb6..8d88150368 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/help/help.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/help/help.controller.js @@ -2,9 +2,12 @@ angular.module("umbraco") .controller("Umbraco.Overlays.HelpController", function ($scope, $location, $routeParams, helpService, userService, localizationService) { $scope.section = $routeParams.section; $scope.version = Umbraco.Sys.ServerVariables.application.version + " assembly: " + Umbraco.Sys.ServerVariables.application.assemblyVersion; - $scope.model.title = "Help"; $scope.model.subtitle = "Umbraco version" + " " + $scope.version; + if(!$scope.model.title) { + $scope.model.title = localizationService.localize("general_help").then(function (value) {return value;}); + } + if(!$scope.section){ $scope.section = "content"; } @@ -19,11 +22,6 @@ angular.module("umbraco") $scope.sectionName = value; }); - // translate dialog title - localizationService.localize("sections_help").then(function (value) { - $scope.model.title = value; - }); - userService.getCurrentUser().then(function(user){ rq.usertype = user.userType; diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/iconpicker/iconpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/iconpicker/iconpicker.controller.js index 9d01c0d579..8cd58dda5e 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/iconpicker/iconpicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/iconpicker/iconpicker.controller.js @@ -6,14 +6,16 @@ * @description * The controller for the content type editor property dialog */ -function IconPickerOverlay($scope, iconHelper) { +function IconPickerOverlay($scope, iconHelper, localizationService) { $scope.loading = true; $scope.model.hideSubmitButton = true; - if(!$scope.model.title) { - $scope.model.title = "Select an icon"; - } + if (!$scope.model.title) { + $scope.model.title = localizationService.localize("defaultdialogs_selectIcon").then(function(value) { + return value; + }); + } iconHelper.getIcons().then(function(icons) { $scope.icons = icons; diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.controller.js index db858db679..fdb687e5f4 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.controller.js @@ -1,11 +1,17 @@ -function ItemPickerOverlay($scope) { +function ItemPickerOverlay($scope, localizationService) { - $scope.model.hideSubmitButton = true; + if (!$scope.model.title) { + $scope.model.title = localizationService.localize("defaultdialogs_selectItem").then(function(value) { + return value; + }); + } - $scope.selectItem = function(item) { - $scope.model.selectedItem = item; - $scope.submitForm($scope.model); - }; + $scope.model.hideSubmitButton = true; + + $scope.selectItem = function(item) { + $scope.model.selectedItem = item; + $scope.submitForm($scope.model); + }; } diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js index 7458f04011..59e97566c8 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js @@ -8,9 +8,9 @@ angular.module("umbraco").controller("Umbraco.Overlays.LinkPickerController", searchText = value + "..."; }); - if(!$scope.model.title) { - $scope.model.title = "Link picker"; - } + if(!$scope.model.title) { + $scope.model.title = localizationService.localize("defaultdialogs_selectLink").then(function (value) {return value;}); + } $scope.dialogTreeEventHandler = $({}); $scope.model.target = {}; diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/macropicker/macropicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/macropicker/macropicker.controller.js index 8fef90b607..6ab02fecbc 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/macropicker/macropicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/macropicker/macropicker.controller.js @@ -1,7 +1,10 @@ -function MacroPickerController($scope, entityResource, macroResource, umbPropEditorHelper, macroService, formHelper) { +function MacroPickerController($scope, entityResource, macroResource, umbPropEditorHelper, macroService, formHelper, localizationService) { - $scope.model.title = "Macro picker"; + if(!$scope.model.title) { + $scope.model.title = localizationService.localize("defaultdialogs_selectMacro").then(function (value) {return value;}); + } + $scope.macros = []; $scope.model.selectedMacro = null; $scope.wizardStep = "macroSelect"; diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js index 4ad796ee11..88b4ed3788 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js @@ -1,7 +1,11 @@ //used for the media picker dialog angular.module("umbraco") .controller("Umbraco.Overlays.MediaPickerController", - function ($scope, mediaResource, umbRequestHelper, entityResource, $log, mediaHelper, eventsService, treeService, $element, $timeout, $cookies, $cookieStore) { + function ($scope, mediaResource, umbRequestHelper, entityResource, $log, mediaHelper, eventsService, treeService, $element, $timeout, $cookies, $cookieStore, localizationService) { + + if(!$scope.model.title) { + $scope.model.title = localizationService.localize("defaultdialogs_selectMedia").then(function (value) {return value;}); + } var dialogOptions = $scope.model; diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/membergrouppicker/membergrouppicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/membergrouppicker/membergrouppicker.controller.js index 4457ac8f90..b38e1c1c59 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/membergrouppicker/membergrouppicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/membergrouppicker/membergrouppicker.controller.js @@ -1,6 +1,10 @@ //used for the member picker dialog angular.module("umbraco").controller("Umbraco.Overlays.MemberGroupPickerController", - function($scope, eventsService, entityResource, searchService, $log) { + function($scope, eventsService, entityResource, searchService, $log, localizationService) { + + if(!$scope.model.title) { + $scope.model.title = localizationService.localize("defaultdialogs_selectMemberGroup").then(function (value) {return value;}); + } $scope.dialogTreeEventHandler = $({}); $scope.multiPicker = $scope.model.multiPicker; diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/move/move.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/move/move.controller.js index abe58b9a02..3324b244d8 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/move/move.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/move/move.controller.js @@ -17,6 +17,10 @@ searchText = value + "..."; }); + if(!$scope.model.title) { + $scope.model.title = localizationService.localize("actions_move").then(function (value) {return value;}); + } + $scope.model.relateToOriginal = true; $scope.dialogTreeEventHandler = $({}); diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js index 2e530235d3..6f5438de24 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js @@ -23,10 +23,19 @@ angular.module("umbraco").controller("Umbraco.Overlays.TreePickerController", if(contentType === "content") { entityType = "Document"; + if(!$scope.model.title) { + $scope.model.title = localizationService.localize("defaultdialogs_selectContent").then(function (value) {return value;}); + } } else if(contentType === "member") { entityType = "Member"; + if(!$scope.model.title) { + $scope.model.title = localizationService.localize("defaultdialogs_selectMember").then(function (value) {return value;}); + } } else if(contentType === "media") { entityType = "Media"; + if(!$scope.model.title) { + $scope.model.title = localizationService.localize("defaultdialogs_selectMedia").then(function (value) {return value;}); + } } } diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.controller.js index d76dac9bdf..544b50ceef 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.controller.js @@ -7,6 +7,10 @@ angular.module("umbraco") $scope.changePasswordButtonState = "init"; $scope.model.subtitle = "Umbraco version" + " " + $scope.version; + if(!$scope.model.title) { + $scope.model.title = localizationService.localize("general_user").then(function (value) {return value;}); + } + $scope.externalLoginProviders = externalLoginInfo.providers; $scope.externalLinkLoginFormAction = Umbraco.Sys.ServerVariables.umbracoUrls.externalLinkLoginsUrl; var evts = []; diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/ysod/ysod.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/ysod/ysod.controller.js index 2b07b8830f..a060036765 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/ysod/ysod.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/ysod/ysod.controller.js @@ -1,8 +1,8 @@ angular.module("umbraco") .controller("Umbraco.Overlays.YsodController", function ($scope, legacyResource, treeService, navigationService) { - if (!$scope.model.title) { - $scope.model.title = "Received an error from the server"; + if(!$scope.model.title) { + $scope.model.title = localizationService.localize("errors_receivedErrorFromServer").then(function (value) {return value;}); } if ($scope.model.error && $scope.model.error.data && $scope.model.error.data.StackTrace) { diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml index f1a89c0934..8bc6f15836 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml @@ -252,7 +252,15 @@ Opens the linked document in the parent frame Link to media - SelectMedia + + Select media + Select icon + Select item + Select link + Select macro + Select content + Select member + Select member group There are no parameters for this macro @@ -265,6 +273,7 @@ account + Select editor List view Saving... current + Move + Embed @@ -1207,4 +1218,7 @@ To manage your website, simply open the Umbraco back office and start adding con Your recent history Session expires in + + Received an error from the server + From 96db5a5be3bb7976430266379b2b07ee5d3c24ee Mon Sep 17 00:00:00 2001 From: Simon Busborg Date: Wed, 13 Jan 2016 13:30:13 +0100 Subject: [PATCH 15/30] translation file for drop zone directive --- src/Umbraco.Web.UI/umbraco/config/lang/en.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml index 8bc6f15836..87e379b134 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml @@ -171,6 +171,9 @@ Click to upload Drop your files here... Link to media + or click here to choose files + Only allowed file types are + Max file size is Create a new member From 5cefd9ad208d0be0a319d9058fd3fe510ac12efa Mon Sep 17 00:00:00 2001 From: Simon Busborg Date: Wed, 13 Jan 2016 13:30:43 +0100 Subject: [PATCH 16/30] localize property validation --- .../propertysettings/propertysettings.controller.js | 10 +++++----- src/Umbraco.Web.UI/umbraco/config/lang/en.xml | 6 ++++++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/propertysettings/propertysettings.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/propertysettings/propertysettings.controller.js index c41c6261a1..e9fb6130ea 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/propertysettings/propertysettings.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/propertysettings/propertysettings.controller.js @@ -10,7 +10,7 @@ (function() { "use strict"; - function PropertySettingsOverlay($scope, contentTypeResource, dataTypeResource, dataTypeHelper) { + function PropertySettingsOverlay($scope, contentTypeResource, dataTypeResource, dataTypeHelper, localizationService) { var vm = this; @@ -20,25 +20,25 @@ vm.selectedValidationType = {}; vm.validationTypes = [ { - "name": "Validate as email", + "name": localizationService.localize("validation_validateAsEmail").then(function (value) {return value;}), "key": "email", "pattern": "[a-zA-Z0-9_\.\+-]+@[a-zA-Z0-9-]+\.[a-zA-Z0-9-\.]+", "enableEditing": true }, { - "name": "Validate as a number", + "name": localizationService.localize("validation_validateAsNumber").then(function (value) {return value;}), "key": "number", "pattern": "^[0-9]*$", "enableEditing": true }, { - "name": "Validate as a Url", + "name": localizationService.localize("validation_validateAsUrl").then(function (value) {return value;}), "key": "url", "pattern": "https?\:\/\/[a-zA-Z0-9\-\.]+\.[a-zA-Z]{2,}", "enableEditing": true }, { - "name": "...or enter a custom validation", + "name": localizationService.localize("validation_enterCustomValidation").then(function (value) {return value;}), "key": "custom", "pattern": "", "enableEditing": true diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml index 87e379b134..57e8b9dae0 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml @@ -1224,4 +1224,10 @@ To manage your website, simply open the Umbraco back office and start adding con Received an error from the server + + Validate as email + Validate as a number + Validate as a Url + ...or enter a custom validation + From 8a07f47077865de8eab0206a29c8e4d6205cac7a Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Wed, 13 Jan 2016 13:54:37 +0100 Subject: [PATCH 17/30] add localizationService as dependency on ysod overlay --- .../src/views/common/overlays/ysod/ysod.controller.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/ysod/ysod.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/ysod/ysod.controller.js index a060036765..7dfd11513f 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/ysod/ysod.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/ysod/ysod.controller.js @@ -1,5 +1,5 @@ angular.module("umbraco") - .controller("Umbraco.Overlays.YsodController", function ($scope, legacyResource, treeService, navigationService) { + .controller("Umbraco.Overlays.YsodController", function ($scope, legacyResource, treeService, navigationService, localizationService) { if(!$scope.model.title) { $scope.model.title = localizationService.localize("errors_receivedErrorFromServer").then(function (value) {return value;}); From 2e6621f31b6418f8ad4e582bb96c0d8a2b6b3ac5 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Wed, 13 Jan 2016 14:18:38 +0100 Subject: [PATCH 18/30] fix key for umbChildSelector directive --- .../src/views/components/umb-child-selector.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-child-selector.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-child-selector.html index 25f6c25a2f..686937e8c9 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/umb-child-selector.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-child-selector.html @@ -9,7 +9,7 @@ {{ parentName }} - (Current) + () From a7627e34821180e8c84d7390efa87e996088f769 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Wed, 13 Jan 2016 14:25:58 +0100 Subject: [PATCH 19/30] fix save list view button --- .../src/views/components/umb-list-view-settings.html | 2 +- src/Umbraco.Web.UI/umbraco/config/lang/en.xml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-list-view-settings.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-list-view-settings.html index b14ef2ff84..739a252ff1 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/umb-list-view-settings.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-list-view-settings.html @@ -32,7 +32,7 @@ - + diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml index 57e8b9dae0..a65fffd616 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml @@ -89,6 +89,7 @@ Save Save and publish Save and send for approval + Save list view Preview Preview is disabled because there's no template assigned Choose style From b67b7c91a533672f126f1276de52f475f6d7841b Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Wed, 13 Jan 2016 14:32:11 +0100 Subject: [PATCH 20/30] localize no compositions --- .../overlays/contenttypeeditor/compositions/compositions.html | 2 +- src/Umbraco.Web.UI/umbraco/config/lang/en.xml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/compositions/compositions.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/compositions/compositions.html index d72b91b685..9952f980d9 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/compositions/compositions.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/compositions/compositions.html @@ -20,7 +20,7 @@ - There are no content types available to use as a composition. + Inherit tabs and properties from an existing document type. New tabs will be added to the current document type or merged if a tab with an identical name exists. This content type is used in a composition, and therefore cannot be composed itself. + There are no content types available to use as a composition. available editors Reuse From 4bb4ce0ef4ab5de81a925e28eec8cf696e440a68 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Wed, 13 Jan 2016 15:15:20 +0100 Subject: [PATCH 21/30] localize header --- .../components/editor/umb-editor-header.html | 26 +++++++++++++------ 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html index 8a5feafc97..fd112a018a 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html @@ -16,13 +16,17 @@
- +
{{ name }}
@@ -34,7 +38,13 @@ enable-lock="true" server-validation-field="Alias"> - +
From c66a6bb06f27d733426d06ddd3b20415ef5370bd Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Wed, 13 Jan 2016 15:47:56 +0100 Subject: [PATCH 22/30] localize list view checkbox text --- .../src/views/components/umb-list-view-settings.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-list-view-settings.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-list-view-settings.html index 739a252ff1..5afd3012eb 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/umb-list-view-settings.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-list-view-settings.html @@ -2,8 +2,8 @@
+ + -
From 487d2c6ea16eb0bd708eecaeff5a036a2ced9b2b Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Wed, 13 Jan 2016 16:00:29 +0100 Subject: [PATCH 23/30] localize property settings overlay --- .../propertysettings/propertysettings.html | 13 +++++++++---- src/Umbraco.Web.UI/umbraco/config/lang/en.xml | 2 ++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/propertysettings/propertysettings.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/propertysettings/propertysettings.html index 19938ecbc7..4d2037d88e 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/propertysettings/propertysettings.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/propertysettings/propertysettings.html @@ -5,7 +5,8 @@ @@ -31,7 +33,9 @@
- Add Editor + + +
@@ -58,7 +62,8 @@