Browse Source

Localization improvements.

pull/395/head
Halil ibrahim Kalkan 8 years ago
parent
commit
74b7a43330
  1. 6
      framework/src/Volo.Abp.Localization/Volo/Abp/Localization/ILocalizationDictionary.cs
  2. 6
      framework/src/Volo.Abp.Localization/Volo/Abp/Localization/Json/JsonLocalizationDictionaryBuilder.cs
  3. 14
      framework/src/Volo.Abp.Localization/Volo/Abp/Localization/LocalizationDictionary.cs

6
framework/src/Volo.Abp.Localization/Volo/Abp/Localization/ILocalizationDictionary.cs

@ -9,12 +9,6 @@ namespace Volo.Abp.Localization
{
string CultureName { get; }
/// <summary>
/// Gets/sets a string for this dictionary with given name (key).
/// </summary>
/// <param name="name">Name to get/set</param>
LocalString this[string name] { get; set; }
/// <summary>
/// Gets a <see cref="LocalString"/> for given <paramref name="name"/>.
/// </summary>

6
framework/src/Volo.Abp.Localization/Volo/Abp/Localization/Json/JsonLocalizationDictionaryBuilder.cs

@ -51,7 +51,7 @@ namespace Volo.Abp.Localization.Json
throw new AbpException("Culture is empty in language json file.");
}
var dictionary = new LocalizationDictionary(cultureCode);
var dictionary = new Dictionary<string, LocalString>();
var dublicateNames = new List<string>();
foreach (var item in jsonFile.Texts)
{
@ -60,7 +60,7 @@ namespace Volo.Abp.Localization.Json
throw new AbpException("The key is empty in given json string.");
}
if (dictionary.GetOrNull(item.Key) != null)
if (dictionary.GetOrDefault(item.Key) != null)
{
dublicateNames.Add(item.Key);
}
@ -75,7 +75,7 @@ namespace Volo.Abp.Localization.Json
dublicateNames.JoinAsString(", "));
}
return dictionary;
return new LocalizationDictionary(cultureCode, dictionary);
}
}
}

14
framework/src/Volo.Abp.Localization/Volo/Abp/Localization/LocalizationDictionary.cs

@ -11,13 +11,6 @@ namespace Volo.Abp.Localization
{
/// <inheritdoc/>
public string CultureName { get; }
/// <inheritdoc/>
public virtual LocalString this[string name]
{
get => GetOrNull(name);
set => _dictionary[name] = value;
}
private readonly Dictionary<string, LocalString> _dictionary;
@ -25,10 +18,11 @@ namespace Volo.Abp.Localization
/// Creates a new <see cref="LocalizationDictionary"/> object.
/// </summary>
/// <param name="cultureName">Culture of the dictionary</param>
public LocalizationDictionary(string cultureName)
/// <param name="dictionary">The dictionary</param>
public LocalizationDictionary(string cultureName, Dictionary<string, LocalString> dictionary)
{
CultureName = cultureName;
_dictionary = new Dictionary<string, LocalString>();
_dictionary = dictionary;
}
/// <inheritdoc/>
@ -47,7 +41,7 @@ namespace Volo.Abp.Localization
{
foreach (var localizedString in dictionary.GetAllStrings())
{
this[localizedString.Name] = localizedString;
_dictionary[localizedString.Name] = localizedString;
}
}

Loading…
Cancel
Save