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

More or less fixes content localization. Must do more tests and fix create dialog. Only tested manually on my box.

Browse Source
This commit is contained in:
Lars-Erik Aabech
2014-01-07 16:43:03 +01:00
parent 1408e4f64e
commit f7f6cc64ce
2 changed files with 29 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Web/Models/Mapping/ContentPropertyDisplayConverter.cs
View File

@@ -32,8 +32,8 @@ namespace Umbraco.Web.Models.Mapping
//set the display properties after mapping
display.Alias = originalProp.Alias;
display.Description = originalProp.PropertyType.Description;
display.Label = originalProp.PropertyType.Name;
display.Description = TabsAndPropertiesResolver.TranslateItem(originalProp.PropertyType.Description);
display.Label = TabsAndPropertiesResolver.TranslateItem(originalProp.PropertyType.Name);
display.HideLabel = valEditor.HideLabel;
if (display.PropertyEditor == null)

39
src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs
View File

@@ -172,7 +172,7 @@ namespace Umbraco.Web.Models.Mapping
{
Id = rootGroup.Id,
Alias = rootGroup.Name,
Label = TranslateTab(rootGroup.Name),
Label = TranslateItem(rootGroup.Name),
Properties = aggregateProperties,
IsActive = false
});
@@ -198,33 +198,48 @@ namespace Umbraco.Web.Models.Mapping
return aggregateTabs;
}
private string TranslateTab(string tabName)
internal static string TranslateItem(string text)
{
if (!tabName.StartsWith("#"))
return tabName;
if (!text.StartsWith("#"))
return text;
return tabName.Substring(1);
text = text.Substring(1);
/*
* The below currently doesnt work on my machine, since the dictonary always creates an entry with lang id = 0, but I dont have a lang id zero
* so the query always fails, which is odd
*
* */
var local = ApplicationContext.Current.Services.LocalizationService;
var dic = local.GetDictionaryItemByKey(tabName);
var dic = local.GetDictionaryItemByKey(text);
if (dic == null || !dic.Translations.Any())
return tabName;
return text;
/*This code does not work at all with my config, languages doesn't have culturename, at least not lowercase.
* Changing to GetAll() and comparing cultures / parents, since en-uk is "en" for my admin user.
*
var lang = local.GetLanguageByCultureCode(UmbracoContext.Current.Security.CurrentUser.Language);
if (lang == null)
return tabName;
*/
/* Someone should probably really look into CurrentUser.Language. Lowercase??? en??? */
var userCultureCode = UmbracoContext.Current.Security.CurrentUser.Language;
if (userCultureCode.Length > 2)
{
var parts = userCultureCode.Split('-', '_');
userCultureCode = String.Format("{0}-{1}", parts[0], parts[1].ToUpper());
}
var userCulture = System.Globalization.CultureInfo.GetCultureInfo(userCultureCode);
var lang = local.GetAllLanguages()
.FirstOrDefault(l => l.CultureInfo.Equals(userCulture) || l.CultureInfo.Parent.Equals(userCulture));
var translation = dic.Translations.Where(x => x.Language == lang).FirstOrDefault();
if (translation == null)
return tabName;
return text;
return translation.Value;*/
return translation.Value;
}
}
}