IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-20 11:48:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Better OSX language handling: Add a "C" locale to the language-list

Browse Source 
after any english locale so that if that english locale isn't present, 
gettext will fall through to "C", which makes unnecessary the "en.po" 
file. Also removed the special casing and locale truncation; gettext is 
quite capable of doing that itself.



git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20188 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
John Ralls 2011-01-28 21:03:40 +00:00
parent 742db08612
commit c2702ebec4
3 changed files with 8 additions and 26444 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -79,7 +79,7 @@ AC_DEFINE_UNQUOTED(GNUCASH_LATEST_STABLE_SERIES, "$GNUCASH_LATEST_STABLE_SERIES"
[Most recent stable GnuCash series])
dnl Set of available languages.
ALL_LINGUAS="bg ca cs da de el en en_GB es_NI es eu fa fi fr he hu it ja ko lt lv nb ne nl pl pt_BR pt ro ru rw sk sv ta tr uk vi zh_CN zh_TW"
ALL_LINGUAS="bg ca cs da de el en_GB es_NI es eu fa fi fr he hu it ja ko lt lv nb ne nl pl pt_BR pt ro ru rw sk sv ta tr uk vi zh_CN zh_TW"
GETTEXT_PACKAGE=gnucash
AC_SUBST(GETTEXT_PACKAGE)

26429
po/en.po
View File

File diff suppressed because it is too large Load Diff

21
src/bin/gnucash-bin.c
View File

@ -305,13 +305,7 @@ set_mac_locale()
/* Now call gnc_localeconv() to force creation of the app locale
* before another call to setlocale messes it up. */
gnc_localeconv ();
/* Process the language list. Since all of the packages we depend on
* are written in US english, they depend on gettext falling through
* to the C locale. Unfortunately, if we set a language list in that
* case with en or en_US as the first element, gettext will try the
* second language in the list (there being no en or en_US mo
* file). We work around that by not creating a language list if en or
* en_US is the first item.
/* Process the language list.
*
* Language subgroups (e.g., US English) are reported in the form
* "ll-SS" (e.g. again, "en-US"), not what gettext wants. We convert
@ -337,16 +331,15 @@ set_mac_locale()
else
this_lang = [NSString stringWithString: @"zh_TW"];
}
/* Gnucash has 3 translations with country specifications (other than chinese): en_GB, es_NI, and pt_BR. All of the rest are plain. Since gettext is too stupid on its own to look for pt if pt_PT isn't available, we'll special case those three and */
else if ([this_lang isEqualToString: @"en-GB"] ||
[this_lang isEqualToString: @"es-NI"] ||
[this_lang isEqualToString: @"pt-BR"] )
this_lang = [elements componentsJoinedByString: @"_"];
else
this_lang = [elements objectAtIndex: 0];
this_lang = [elements componentsJoinedByString: @"_"];
}
new_languages = [new_languages arrayByAddingObject: this_lang];
/* If it's an english language, add the "C" locale after it so that
* any messages can default to it */
if ( [[elements objectAtIndex: 0] isEqualToString: @"en"])
new_languages = [new_languages arrayByAddingObject: @"C"];
}
langs = [[new_languages componentsJoinedByString:@":"] UTF8String];
}