mirror of
https://github.com/greenshot/greenshot
synced 2025-07-14 17:13:44 -07:00
removed usages of CultureInfo for our translations, to avoid warnings when using cultures that .NET does not know of
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@2197 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
This commit is contained in:
parent
c97600982a
commit
cbf04192b6
4 changed files with 7 additions and 7 deletions
|
@ -15,6 +15,6 @@ namespace TranslationByMarkupExtension {
|
||||||
/// Gets the available languages.
|
/// Gets the available languages.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <value>The available languages.</value>
|
/// <value>The available languages.</value>
|
||||||
IEnumerable<CultureInfo> Languages { get; }
|
//IEnumerable<CultureInfo> Languages { get; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -45,13 +45,13 @@ namespace TranslationByMarkupExtension {
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// See <see cref="ITranslationProvider.AvailableLanguages" />
|
/// See <see cref="ITranslationProvider.AvailableLanguages" />
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public IEnumerable<CultureInfo> Languages {
|
/*public IEnumerable<CultureInfo> Languages {
|
||||||
get {
|
get {
|
||||||
foreach (LanguageFile supportedLanguage in Language.SupportedLanguages) {
|
foreach (LanguageFile supportedLanguage in Language.SupportedLanguages) {
|
||||||
yield return new CultureInfo(supportedLanguage.Ietf);
|
yield return new CultureInfo(supportedLanguage.Ietf);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}*/
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,7 +10,7 @@ namespace TranslationByMarkupExtension {
|
||||||
|
|
||||||
public event EventHandler LanguageChanged;
|
public event EventHandler LanguageChanged;
|
||||||
|
|
||||||
public CultureInfo CurrentLanguage {
|
/*public CultureInfo CurrentLanguage {
|
||||||
get { return Thread.CurrentThread.CurrentUICulture; }
|
get { return Thread.CurrentThread.CurrentUICulture; }
|
||||||
set {
|
set {
|
||||||
if( value != Thread.CurrentThread.CurrentUICulture) {
|
if( value != Thread.CurrentThread.CurrentUICulture) {
|
||||||
|
@ -27,7 +27,7 @@ namespace TranslationByMarkupExtension {
|
||||||
}
|
}
|
||||||
return Enumerable.Empty<CultureInfo>();
|
return Enumerable.Empty<CultureInfo>();
|
||||||
}
|
}
|
||||||
}
|
}*/
|
||||||
|
|
||||||
public static TranslationManager Instance {
|
public static TranslationManager Instance {
|
||||||
get {
|
get {
|
||||||
|
|
|
@ -195,8 +195,8 @@ namespace GreenshotPlugin.Core {
|
||||||
} else if (type.Equals("Translations")) {
|
} else if (type.Equals("Translations")) {
|
||||||
string culture = Regex.Replace(file, @"[a-zA-Z]+-(..-..)\.(xml|html)", "$1");
|
string culture = Regex.Replace(file, @"[a-zA-Z]+-(..-..)\.(xml|html)", "$1");
|
||||||
try {
|
try {
|
||||||
CultureInfo cultureInfo = new CultureInfo(culture);
|
//CultureInfo cultureInfo = new CultureInfo(culture);
|
||||||
rssFile.Language = cultureInfo.NativeName;
|
rssFile.Language = culture;//cultureInfo.NativeName;
|
||||||
} catch (Exception) {
|
} catch (Exception) {
|
||||||
LOG.WarnFormat("Can't read the native name of the culture {0}", culture);
|
LOG.WarnFormat("Can't read the native name of the culture {0}", culture);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue