From 69af591b781d552d78872c7b5bf2fb27455e6d08 Mon Sep 17 00:00:00 2001 From: Bjarne Fyrstenborg Date: Wed, 30 Jan 2019 14:01:22 +0100 Subject: [PATCH] v8: Fix general localization (#4274) --- .../umbmembergroupnodeinfo.directive.js | 58 ++++++++++ .../src/views/common/drawers/help/help.html | 101 +++++++++--------- .../member/umb-membergroup-node-info.html | 30 ++++++ .../views/macros/macros.edit.controller.js | 42 +++++--- .../views/macro.parameters.controller.js | 1 - .../src/views/macros/views/parameters.html | 4 +- .../src/views/membergroups/edit.html | 5 +- src/Umbraco.Web.UI/Umbraco/config/lang/da.xml | 41 ++++--- src/Umbraco.Web.UI/Umbraco/config/lang/en.xml | 44 +++++--- .../Umbraco/config/lang/en_us.xml | 22 ++-- .../Editors/MemberGroupController.cs | 6 +- 11 files changed, 247 insertions(+), 107 deletions(-) create mode 100644 src/Umbraco.Web.UI.Client/src/common/directives/components/member/umbmembergroupnodeinfo.directive.js create mode 100644 src/Umbraco.Web.UI.Client/src/views/components/member/umb-membergroup-node-info.html diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/member/umbmembergroupnodeinfo.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/member/umbmembergroupnodeinfo.directive.js new file mode 100644 index 0000000000..10e1291731 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/member/umbmembergroupnodeinfo.directive.js @@ -0,0 +1,58 @@ +(function () { + 'use strict'; + + function MemberGroupNodeInfoDirective(eventsService, userService, dateHelper) { + + function link(scope, element, attrs, ctrl) { + + var evts = []; + + function onInit() { + + // make sure dates are formatted to the user's locale + formatDatesToLocal(); + } + + function formatDatesToLocal() { + // get current backoffice user and format dates + userService.getCurrentUser().then(function (currentUser) { + scope.node.createDateFormatted = dateHelper.getLocalDate(scope.node.createDate, currentUser.locale, 'LLL'); + scope.node.updateDateFormatted = dateHelper.getLocalDate(scope.node.updateDate, currentUser.locale, 'LLL'); + }); + } + + // watch for content updates - reload content when node is saved, published etc. + scope.$watch('node.updateDate', function(newValue, oldValue){ + if(!newValue) { return; } + if(newValue === oldValue) { return; } + + // Update the create and update dates + formatDatesToLocal(); + }); + + //ensure to unregister from all events! + scope.$on('$destroy', function () { + for (var e in evts) { + eventsService.unsubscribe(evts[e]); + } + }); + + onInit(); + } + + var directive = { + restrict: 'E', + replace: true, + templateUrl: 'views/components/member/umb-membergroup-node-info.html', + scope: { + node: "=" + }, + link: link + }; + + return directive; + } + + angular.module('umbraco.directives').directive('umbMembergroupNodeInfo', MemberGroupNodeInfoDirective); + +})(); diff --git a/src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.html b/src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.html index 0e777a5b9f..f38bb78929 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.html @@ -8,7 +8,7 @@ - +
Tours
@@ -47,72 +47,71 @@
- + - - +
-
-
-
-
{{property.caption}}
-
-
+
+
+
+
{{property.caption}}
+
+
- +
Articles
-
+ {{topic.description}} + + + + +
- +
Videos
- -
+ +
- +
- -
Visit umbraco.tv
- - The best Umbraco video tutorials - - + +
Visit umbraco.tv
+ + The best Umbraco video tutorials + + - + -
Visit our.umbraco.com
- - The friendliest community - - -
+
Visit our.umbraco.com
+ + The friendliest community + + + @@ -123,7 +122,7 @@ alias="close" type="button" button-style="link" - label="Close" + label-key="general_close" action="vm.closeDrawer()"> @@ -132,4 +131,4 @@ - \ No newline at end of file + diff --git a/src/Umbraco.Web.UI.Client/src/views/components/member/umb-membergroup-node-info.html b/src/Umbraco.Web.UI.Client/src/views/components/member/umb-membergroup-node-info.html new file mode 100644 index 0000000000..1f10cf0599 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/views/components/member/umb-membergroup-node-info.html @@ -0,0 +1,30 @@ +
+
+ + + + + + Member groups have no additional properties for editing. + + + + + +
+ +
+ + + + + +
{{ node.id }}
+ {{ node.key }} + + + + +
+ +
diff --git a/src/Umbraco.Web.UI.Client/src/views/macros/macros.edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/macros/macros.edit.controller.js index 978025ceb4..fd998ce4ba 100644 --- a/src/Umbraco.Web.UI.Client/src/views/macros/macros.edit.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/macros/macros.edit.controller.js @@ -16,8 +16,7 @@ function MacrosEditController($scope, $q, $routeParams, macroResource, editorSta vm.page.loading = false; vm.page.saveButtonState = "init"; vm.page.menu = {} - - + vm.labels = {}; function toggleValue(key) { vm.macro[key] = !vm.macro[key]; @@ -132,21 +131,32 @@ function MacrosEditController($scope, $q, $routeParams, macroResource, editorSta vm.page.loading = false; }); - vm.page.navigation = [ - { - "name": "Settings", - "alias": "settings", - "icon": "icon-settings", - "view": "views/macros/views/settings.html", - "active": true - }, - { - "name": "Parameters", - "alias": "parameters", - "icon": "icon-list", - "view": "views/macros/views/parameters.html" - } + var labelKeys = [ + "general_settings", + "macro_parameters" ]; + + localizationService.localizeMany(labelKeys).then(function (values) { + // navigation + vm.labels.settings = values[0]; + vm.labels.parameters = values[1]; + + vm.page.navigation = [ + { + "name": vm.labels.settings, + "alias": "settings", + "icon": "icon-settings", + "view": "views/macros/views/settings.html", + "active": true + }, + { + "name": vm.labels.parameters, + "alias": "parameters", + "icon": "icon-list", + "view": "views/macros/views/parameters.html" + } + ]; + }); } init(); diff --git a/src/Umbraco.Web.UI.Client/src/views/macros/views/macro.parameters.controller.js b/src/Umbraco.Web.UI.Client/src/views/macros/views/macro.parameters.controller.js index 851b537c3b..9ae13399fa 100644 --- a/src/Umbraco.Web.UI.Client/src/views/macros/views/macro.parameters.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/macros/views/macro.parameters.controller.js @@ -47,7 +47,6 @@ function MacrosParametersController($scope, editorService) { parameter.key = newParameter.key; parameter.label = newParameter.label; parameter.editor = newParameter.editor; - parameter.editor = newParameter.editor; $scope.model.setDirty(); }); } diff --git a/src/Umbraco.Web.UI.Client/src/views/macros/views/parameters.html b/src/Umbraco.Web.UI.Client/src/views/macros/views/parameters.html index 91231a49b7..543059e5a8 100644 --- a/src/Umbraco.Web.UI.Client/src/views/macros/views/parameters.html +++ b/src/Umbraco.Web.UI.Client/src/views/macros/views/parameters.html @@ -2,8 +2,8 @@
-
Parameters
- Define the parameters hat should be available when using his macro +
Parameters
+ Define the parameters that should be available when using this macro.
diff --git a/src/Umbraco.Web.UI.Client/src/views/membergroups/edit.html b/src/Umbraco.Web.UI.Client/src/views/membergroups/edit.html index bf9e5e67b6..ae61b12522 100644 --- a/src/Umbraco.Web.UI.Client/src/views/membergroups/edit.html +++ b/src/Umbraco.Web.UI.Client/src/views/membergroups/edit.html @@ -19,10 +19,11 @@ -

Member groups have no additional properties for editing.

+ + - diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml index 3c57fa35d8..f4568841c9 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml @@ -300,6 +300,7 @@ Opret et nyt medlem Alle medlemmer + Medlemgrupper har ingen yderligere egenskaber til redigering. Hvor ønsker du at oprette den nye %0% @@ -622,6 +623,7 @@ Beklager, vi kan ikke finde det, du leder efter. Ingen elementer er blevet tilføjet Server + Indstillinger Vis Hvilken side skal vises efter at formularen er sendt Størrelse @@ -1020,6 +1022,11 @@ Mange hilsner fra Umbraco robotten + Validering + Valideringsfejl skal rettes før elementet kan gemmes + Fejlet + Gemt + Utilstrækkelige brugerrettigheder, kunne ikke fuldføre handlingen Annulleret Handlingen blev annulleret af et 3. part tilføjelsesprogram Property type eksisterer allerede @@ -1044,12 +1051,14 @@ Mange hilsner fra Umbraco robotten Medie gemt Medie gemt uden problemer Medlem gemt + Medlemsgruppe gemt Stylesheetegenskab gemt Stylesheet gemt Skabelon gemt Der er opstået en fejl under redigering Bruger gemt Brugertype gemt + Brugergruppe gemt Fil ikke gemt Filen kunne ikke gemmes. Tjek filrettighederne Fil gemt @@ -1057,6 +1066,7 @@ Mange hilsner fra Umbraco robotten Sprog gemt Medietype gemt Medlemstype gemt + Medlemsgruppe gemt Skabelon ikke gemt Undgå venligst at du har 2 templates med samme alias Skabelon gemt @@ -1215,6 +1225,7 @@ Mange hilsner fra Umbraco robotten Kompositioner Du har ikke tilføjet nogle faner + Tilføj gruppe Nedarvet fra Tilføj egenskab Påkrævet label @@ -1255,16 +1266,19 @@ Mange hilsner fra Umbraco robotten Dette benyttes ikke for en Element-type - Tilføj sprog - Påkrævet sprog - Egenskaber på dette sprog skal være udfyldt før noden kan blive udgivet. - Standard sprog - Et Umbraco site kan kun have et standard sprog. - Ved at skifte standardsprog kan resultere i standard indhold mangler. - Fallsback til - Ingen fallback sprog - For at tillade flersproget indhold til at falde tilbage på et andet sprog, hvis det ikke er tilgængelig i det anmodet sprog, vælg det her. - Fallback sprog + Tilføj sprog + Påkrævet sprog + Egenskaber på dette sprog skal være udfyldt før noden kan blive udgivet. + Standard sprog + Et Umbraco site kan kun have et standard sprog. + Ved at skifte standardsprog kan resultere i standard indhold mangler. + Fallsback til + Ingen fallback sprog + For at tillade flersproget indhold til at falde tilbage på et andet sprog, hvis det ikke er tilgængelig i det anmodet sprog, vælg det her. + Fallback sprog + + + Parametre Alternativt felt @@ -1337,7 +1351,7 @@ Mange hilsner fra Umbraco robotten Pakker Pakker Partial Views - Partial View Makro Filer + Partial View makrofiler Installer fra "repository" Installer Runway Runway-moduler @@ -1346,8 +1360,11 @@ Mange hilsner fra Umbraco robotten Stylesheets Skabeloner Brugertilladelser - Bruger Typer + Brugertyper Brugere + Indstillinger + Design og layout + Tredjepart Ny opdatering er klar diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml index 8135591c0c..47b969dacf 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml @@ -303,10 +303,10 @@ Cannot upload this file, it does not have an approved file type Max file size is Media root - Failed to move media - Failed to copy media - Failed to create a folder under parent id %0% - Failed to rename the folder with id %0% + Failed to move media + Failed to copy media + Failed to create a folder under parent id %0% + Failed to rename the folder with id %0% Create a new member @@ -324,7 +324,7 @@ Document Type without a template New folder New data type - New JavaScript file + New JavaScript file New empty partial view New partial view macro New partial view from snippet @@ -653,7 +653,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 @@ -1219,11 +1219,11 @@ To manage your website, simply open the Umbraco back office and start adding con Enter the link - Reset crop + Reset crop Save crop Add new crop - Done - Undo edits + Done + Undo edits Select a version to compare with the current version @@ -1315,7 +1315,7 @@ To manage your website, simply open the Umbraco back office and start adding con Sent For Approval Changes have been sent for approval Media saved - Member group saved + Member group saved Media saved without any errors Member saved Stylesheet Property Saved @@ -1332,6 +1332,7 @@ To manage your website, simply open the Umbraco back office and start adding con Language saved Media Type saved Member Type saved + Member Group saved Template not saved Please make sure that you do not have 2 templates with the same alias Template saved @@ -1493,6 +1494,7 @@ To manage your website, simply open the Umbraco back office and start adding con Compositions You have not added any tabs + Add group Inherited from Add property Required label @@ -1543,6 +1545,21 @@ To manage your website, simply open the Umbraco back office and start adding con An Element type is meant to be used for instance in Nested Content, and not in the tree This is not applicable for an Element type + + Add language + Mandatory language + Properties on this language have to be filled out before the node can be published. + Default language + An Umbraco site can only have one default language set. + Switching default language may result in default content missing. + Falls back to + No fall back language + To allow multi-lingual content to fall back to another language if not present in the requested language, select it here. + Fall back language + + + Parameters + Building models this can take a bit of time, don't worry @@ -1654,10 +1671,11 @@ To manage your website, simply open the Umbraco back office and start adding con Scripts Stylesheets Templates + Log Viewer Users - Settings - Templating - Third Party + Settings + Templating + Third Party New update ready 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 48ea15e3dc..197dbdc003 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml @@ -307,11 +307,11 @@ Cannot upload this file, it does not have an approved file type Max file size is Media root - Failed to move media - Parent and destination folders cannot be the same - Failed to copy media - Failed to create a folder under parent id %0% - Failed to rename the folder with id %0% + Failed to move media + Parent and destination folders cannot be the same + Failed to copy media + Failed to create a folder under parent id %0% + Failed to rename the folder with id %0% Create a new member @@ -1337,6 +1337,7 @@ To manage your website, simply open the Umbraco back office and start adding con Language saved Media Type saved Member Type saved + Member Group saved Template not saved Please make sure that you do not have 2 templates with the same alias Template saved @@ -1572,6 +1573,9 @@ To manage your website, simply open the Umbraco back office and start adding con To allow multi-lingual content to fall back to another language if not present in the requested language, select it here. Fall back language + + Parameters + Building models this can take a bit of time, don't worry @@ -1685,9 +1689,9 @@ To manage your website, simply open the Umbraco back office and start adding con Templates Log Viewer Users - Settings - Templating - Third Party + Settings + Templating + Third Party New update ready @@ -1774,7 +1778,7 @@ To manage your website, simply open the Umbraco back office and start adding con An invitation has been sent to the new user with details about how to log in to Umbraco. Hello there and welcome to Umbraco! In just 1 minute you’ll be good to go, we just need you to setup a password and add a picture for your avatar. Welcome to Umbraco! Unfortunately your invite has expired. Please contact your administrator and ask them to resend it. - Uploading a photo of yourself will make it easy for other users to recognize you. Click the circle above to upload your photo. + Uploading a photo of yourself will make it easy for other users to recognize you. Click the circle above to upload your photo. Writer Change Your profile diff --git a/src/Umbraco.Web/Editors/MemberGroupController.cs b/src/Umbraco.Web/Editors/MemberGroupController.cs index 6feaab540b..caf158f6de 100644 --- a/src/Umbraco.Web/Editors/MemberGroupController.cs +++ b/src/Umbraco.Web/Editors/MemberGroupController.cs @@ -93,7 +93,11 @@ namespace Umbraco.Web.Editors service.Save(memberGroup); var display = Mapper.Map(memberGroup); - display.AddSuccessNotification(Services.TextService.Localize("speechBubbles/memberGroupSaved"), string.Empty); + + display.AddSuccessNotification( + Services.TextService.Localize("speechBubbles/memberGroupSavedHeader"), + string.Empty); + return display; } }