github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-08-14 02:37:03 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed some language refactoring issues

Browse source 
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@1788 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
This commit is contained in:
RKrom 2012-04-18 07:18:12 +00:00
commit 88e99d78cb
6 changed files with 20 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

12
GreenshotPlugin/Core/Language.cs
View file

@ -93,11 +93,13 @@ namespace GreenshotPlugin.Core {
coreConfig = IniConfig.GetIniSection<CoreConfiguration>();
ScanFiles();
if (!string.IsNullOrEmpty(coreConfig.Language)) {
currentLanguage = coreConfig.Language;
CurrentLanguage = coreConfig.Language;
} else {
currentLanguage = DEFAULT_LANGUAGE;
CurrentLanguage = DEFAULT_LANGUAGE;
}
if (string.IsNullOrEmpty(CurrentLanguage)) {
throw new ApplicationException("Couldn't set language, installation problem?");
}
Reload();
}
/// <summary>
@ -171,8 +173,8 @@ namespace GreenshotPlugin.Core {
return currentLanguage;
}
set {
LOG.DebugFormat("CurrentLangue = {0}, new value {1}", currentLanguage, value);
string ietf = ClearIETF(value);
LOG.DebugFormat("CurrentLangue = {0}, new value {1} ({2})", currentLanguage, value, ietf);
if (!string.IsNullOrEmpty(ietf)) {
if (!languageFiles.ContainsKey(ietf)) {
LOG.WarnFormat("Unknown language {0}, trying best match!", ietf);
@ -187,7 +189,7 @@ namespace GreenshotPlugin.Core {
if (!languageFiles.ContainsKey(ietf)) {
LOG.WarnFormat("No match for language {0} found!", ietf);
} else {
if (currentLanguage == null && !currentLanguage.Equals(ietf)) {
if (currentLanguage == null || !currentLanguage.Equals(ietf)) {
currentLanguage = ietf;
Reload();
return;