From 5cefd9ad208d0be0a319d9058fd3fe510ac12efa Mon Sep 17 00:00:00 2001 From: Simon Busborg Date: Wed, 13 Jan 2016 13:30:43 +0100 Subject: [PATCH] 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 +