yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

typeo and fixes a return value

Browse Source
This commit is contained in:
Shannon
2014-09-12 12:52:32 +10:00
parent 6ab2f8300c
commit 74a113646d
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Core/ApplicationEventHandler.cs
View File

@@ -47,7 +47,7 @@ namespace Umbraco.Core
}
/// <summary>
/// OVerridable method to execute when All resolvers have been initialized but resolution is not frozen so they can be modified in this method
/// Overridable method to execute when All resolvers have been initialized but resolution is not frozen so they can be modified in this method
/// </summary>
/// <param name="umbracoApplication"></param>
/// <param name="applicationContext"></param>

21
src/Umbraco.Web.UI.Client/src/common/services/localization.service.js
View File

@@ -49,18 +49,19 @@ angular.module('umbraco.services')
//helper to tokenize and compile a localization string
tokenize: function(value,scope) {
if(value){
var localizer = value.split(':');
var retval = {tokens: undefined, key: localizer[0].substring(0)};
if(localizer.length > 1){
retval.tokens = localizer[1].split(',');
for (var x = 0; x < retval.tokens.length; x++) {
retval.tokens[x] = scope.$eval(retval.tokens[x]);
}
if (value) {
var localizer = value.split(':');
var retval = { tokens: undefined, key: localizer[0].substring(0) };
if (localizer.length > 1) {
retval.tokens = localizer[1].split(',');
for (var x = 0; x < retval.tokens.length; x++) {
retval.tokens[x] = scope.$eval(retval.tokens[x]);
}
return retval;
}
return retval;
}
return value;
},
// checks the dictionary for a localized resource string