From 5bc0c499d8d413e65eeaa6ac49184786e4e5404a Mon Sep 17 00:00:00 2001 From: bjarnef Date: Wed, 19 Aug 2015 02:03:54 +0200 Subject: [PATCH] Localize text in help dialog Add localization for text in help dialog, create and delete dialogs and some minor parts of the member area. --- .../src/views/common/dialogs/help.html | 12 +++++------ .../src/views/content/create.html | 6 +++--- .../src/views/content/delete.html | 2 +- .../src/views/datatype/delete.html | 2 +- .../src/views/media/delete.html | 2 +- .../src/views/member/create.html | 6 ++++-- .../src/views/member/delete.html | 2 +- src/Umbraco.Web.UI/umbraco/config/lang/da.xml | 15 +++++++++++++- src/Umbraco.Web.UI/umbraco/config/lang/en.xml | 20 ++++++++++++++----- .../umbraco/config/lang/en_us.xml | 10 ++++++++++ src/Umbraco.Web/Trees/MemberTreeController.cs | 2 +- 11 files changed, 57 insertions(+), 22 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/help.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/help.html index 80ce8f80c0..73d3271a89 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/help.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/help.html @@ -1,13 +1,13 @@
-

Help

+

Help

Umbraco version {{version}}
-
Help topics for: {{section}}
+
Help topics for: {{section}}
-
Video chapters for: {{section}}
+
Video chapters for: {{section}}
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/create.html b/src/Umbraco.Web.UI.Client/src/views/content/create.html index e02ea36b5a..d3bc28bc55 100644 --- a/src/Umbraco.Web.UI.Client/src/views/content/create.html +++ b/src/Umbraco.Web.UI.Client/src/views/content/create.html @@ -39,7 +39,7 @@
- +
\ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/views/content/delete.html b/src/Umbraco.Web.UI.Client/src/views/content/delete.html index d3e44fce25..f3bdb0d121 100644 --- a/src/Umbraco.Web.UI.Client/src/views/content/delete.html +++ b/src/Umbraco.Web.UI.Client/src/views/content/delete.html @@ -2,7 +2,7 @@

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

diff --git a/src/Umbraco.Web.UI.Client/src/views/datatype/delete.html b/src/Umbraco.Web.UI.Client/src/views/datatype/delete.html index cddc1b34ad..b7bcae8e3d 100644 --- a/src/Umbraco.Web.UI.Client/src/views/datatype/delete.html +++ b/src/Umbraco.Web.UI.Client/src/views/datatype/delete.html @@ -2,7 +2,7 @@

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

diff --git a/src/Umbraco.Web.UI.Client/src/views/media/delete.html b/src/Umbraco.Web.UI.Client/src/views/media/delete.html index dcbedf8ed7..3c9716eb3f 100644 --- a/src/Umbraco.Web.UI.Client/src/views/media/delete.html +++ b/src/Umbraco.Web.UI.Client/src/views/media/delete.html @@ -2,7 +2,7 @@

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

diff --git a/src/Umbraco.Web.UI.Client/src/views/member/create.html b/src/Umbraco.Web.UI.Client/src/views/member/create.html index 9dcd7ff836..03f0237e38 100644 --- a/src/Umbraco.Web.UI.Client/src/views/member/create.html +++ b/src/Umbraco.Web.UI.Client/src/views/member/create.html @@ -1,7 +1,7 @@
-
Create a new member
+
Create a new member
  • @@ -20,6 +20,8 @@
- +
diff --git a/src/Umbraco.Web.UI.Client/src/views/member/delete.html b/src/Umbraco.Web.UI.Client/src/views/member/delete.html index e701d8cddc..d5d9fa77a6 100644 --- a/src/Umbraco.Web.UI.Client/src/views/member/delete.html +++ b/src/Umbraco.Web.UI.Client/src/views/member/delete.html @@ -2,7 +2,7 @@

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

diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml index 41e8760eea..bb4589ef70 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml @@ -71,6 +71,7 @@ Indsæt makro Indsæt billede Redigér relationer + Tilbage til listen Gem Gem og udgiv Gem og send til udgivelse @@ -155,6 +156,10 @@ Klik for at uploade Slip filerne her... + + Opret et nyt medlem + Alle medlemmer + Hvor ønsker du at oprette den nye %0% Opret under @@ -669,6 +674,14 @@ Mange hilsner fra Umbraco robotten Oversættelse Brugere Hjælp + Formularer + Analytics + + + gå til + Hjælpeemner for + Videokapitler for + De bedste Umbraco video tutorials Standardskabelon @@ -832,7 +845,7 @@ Mange hilsner fra Umbraco robotten Medlemstype Dokumenttyper Pakker - Pakker + Pakker Python Installer fra "repository" Installer Runway diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml index ca44fe7afa..1ebcf1b90d 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml @@ -169,6 +169,10 @@ Click to upload Drop your files here... + + Create a new member + All Members + Where do you want to create the new %0% Create an item under @@ -748,6 +752,12 @@ To manage your website, simply open the Umbraco back office and start adding con Forms Analytics + + go to + Help topics for + Video chapters for + The best Umbraco video tutorials + Default template Dictionary Key @@ -774,11 +784,11 @@ To manage your website, simply open the Umbraco back office and start adding con
Do not close this window during sorting]]> - Failed - Insufficient user permissions, could not complete the operation - Cancelled - Operation was cancelled by a 3rd party add-in - Publishing was cancelled by a 3rd party add-in + Failed + Insufficient user permissions, could not complete the operation + Cancelled + Operation was cancelled by a 3rd party add-in + Publishing was cancelled by a 3rd party add-in Property type already exists Property type created DataType: %1%]]> 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 c779e2b789..f8a362d4f1 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml @@ -169,6 +169,10 @@ Click to upload Drop your files here... + + Create a new member + All Members + Where do you want to create the new %0% Create an item under @@ -749,6 +753,12 @@ To manage your website, simply open the Umbraco back office and start adding con Forms Analytics + + go to + Help topics for + Video chapters for + The best Umbraco video tutorials + Default template Dictionary Key diff --git a/src/Umbraco.Web/Trees/MemberTreeController.cs b/src/Umbraco.Web/Trees/MemberTreeController.cs index d45d0608be..e80cabecfa 100644 --- a/src/Umbraco.Web/Trees/MemberTreeController.cs +++ b/src/Umbraco.Web/Trees/MemberTreeController.cs @@ -122,7 +122,7 @@ namespace Umbraco.Web.Trees if (id == Constants.System.Root.ToInvariantString()) { nodes.Add( - CreateTreeNode(Constants.Conventions.MemberTypes.AllMembersListId, id, queryStrings, "All Members", "icon-users", false, + CreateTreeNode(Constants.Conventions.MemberTypes.AllMembersListId, id, queryStrings, ui.Text("member", "allMembers"), "icon-users", false, queryStrings.GetValue("application") + TreeAlias.EnsureStartsWith('/') + "/list/" + Constants.Conventions.MemberTypes.AllMembersListId)); if (_isUmbracoProvider)