Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7

2017-06-30 16:55:04 +10:00
parent 6cb104cd4f 81aae79b42
commit 29c6d547db
48 changed files with 2022 additions and 298 deletions
--- a/src/Umbraco.Web/Models/Mapping/ContentModelMapper.cs
+++ b/src/Umbraco.Web/Models/Mapping/ContentModelMapper.cs
@@ -108,7 +108,7 @@ namespace Umbraco.Web.Models.Mapping
            }

            //fill in the template config to be passed to the template drop down.
-            var templateItemConfig = new Dictionary<string, string> {{"", "Choose..."}};
+            var templateItemConfig = new Dictionary<string, string> {{"", localizedText.Localize("general/choose")}};
            foreach (var t in content.ContentType.AllowedTemplates
                .Where(t => t.Alias.IsNullOrWhiteSpace() == false && t.Name.IsNullOrWhiteSpace() == false))
            {