1berry/blender
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove six languages from Blender UI (rational: very low level of translation, 1-2% at most, and no commit done in branch since more than one year): fi (Finnish), ca (Catalan), bg (Bulgarian), el (Greek), ne (Nepali) and pl (Polish).

Browse Source 
Also fix compile in paranoid warning=errors mode for own last commit.
This commit is contained in:
Bastien Montagne 2012-10-20 08:52:54 +00:00
parent 494aa37f94
commit 95a414955c
4 changed files with 32 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
release/scripts/modules/bl_i18n_utils/import_po_from_branches.py
View File

@ -39,6 +39,8 @@ except:
TRUNK_PO_DIR = settings.TRUNK_PO_DIR
BRANCHES_DIR = settings.BRANCHES_DIR
IMPORT_LANGUAGES_SKIP = settings.IMPORT_LANGUAGES_SKIP
RTL_PREPROCESS_FILE = settings.RTL_PREPROCESS_FILE
PY3 = settings.PYTHON3_EXEC
@ -63,7 +65,7 @@ def main():
threshold = float(args.threshold) / 100.0
for lang in os.listdir(BRANCHES_DIR):
if args.langs and lang not in args.langs:
if (args.langs and lang not in args.langs) or lang in IMPORT_LANGUAGES_SKIP:
continue
po = os.path.join(BRANCHES_DIR, lang, ".".join((lang, "po")))
if os.path.exists(po):

3
release/scripts/modules/bl_i18n_utils/settings.py
View File

@ -35,6 +35,9 @@ import os.path
# into /trunk, as a percentage. -1 means "import everything".
IMPORT_MIN_LEVEL = -1
# Languages in /branches we do not want to import in /trunk currently...
IMPORT_LANGUAGES_SKIP = {'bg', 'ca', 'fi', 'el', 'ko', 'ne', 'pl', 'ro'}
# The comment prefix used in generated messages.txt file.
COMMENT_PREFIX = "#~ "

33
source/blender/blenfont/intern/blf_lang.c
View File

@ -171,7 +171,6 @@ void BLF_lang_set(const char *str)
char *locreturn;
const char *short_locale;
int ok = 1;
const char *long_locale = locales[2 * U.language];
if ((U.transopts & USER_DOTRANSLATE) == 0)
return;
@ -182,25 +181,29 @@ void BLF_lang_set(const char *str)
short_locale = locales[2 * U.language + 1];
#if defined(_WIN32) && !defined(FREE_WINDOWS)
if (short_locale) {
char *envStr;
{
const char *long_locale = locales[2 * U.language];
if (U.language == 0) /* Use system setting. */
envStr = BLI_sprintfN("LANG=%s", getenv("LANG"));
else
envStr = BLI_sprintfN("LANG=%s", short_locale);
if (short_locale) {
char *envStr;
gettext_putenv(envStr);
MEM_freeN(envStr);
}
if (U.language == 0) /* Use system setting. */
envStr = BLI_sprintfN("LANG=%s", getenv("LANG"));
else
envStr = BLI_sprintfN("LANG=%s", short_locale);
locreturn = setlocale(LC_ALL, long_locale);
gettext_putenv(envStr);
MEM_freeN(envStr);
}
if (locreturn == NULL) {
if (G.debug & G_DEBUG)
printf("Could not change locale to %s\n", long_locale);
locreturn = setlocale(LC_ALL, long_locale);
ok = 0;
if (locreturn == NULL) {
if (G.debug & G_DEBUG)
printf("Could not change locale to %s\n", long_locale);
ok = 0;
}
}
#else
{

16
source/blender/makesrna/intern/rna_userdef.c
View File

@ -3005,27 +3005,27 @@ static void rna_def_userdef_system(BlenderRNA *brna)
{14, "TRADITIONAL_CHINESE", 0, "Traditional Chinese (繁體中文)", "zh_TW"},
{18, "UKRAINIAN", 0, "Ukrainian (Український)", "uk_UA"},
{ 0, "", 0, N_("In Progress"), ""},
{22, "BULGARIAN", 0, "Bulgarian (Български)", "bg_BG"},
{10, "CATALAN", 0, "Catalan (Català)", "ca_AD"},
/* {22, "BULGARIAN", 0, "Bulgarian (Български)", "bg_BG"},*/ /* XXX Not active nor enough translated. */
/* {10, "CATALAN", 0, "Catalan (Català)", "ca_AD"},*/ /* XXX Not active nor enough translated. */
{16, "CROATIAN", 0, "Croatian (Hrvatski)", "hr_HR"},
{11, "CZECH", 0, "Czech (Český)", "cs_CZ"},
{ 3, "DUTCH", 0, "Dutch (Nederlandse taal)", "nl_NL"},
{35, "ESPERANTO", 0, "Esperanto (Esperanto)", "eo"},
{34, "ESTONIAN", 0, "Estonian (Eestlane)", "et_EE"},
{ 6, "FINNISH", 0, "Finnish (Suomi)", "fi_FI"},
/* { 6, "FINNISH", 0, "Finnish (Suomi)", "fi_FI"},*/ /* XXX Not active nor enough translated. */
{ 5, "GERMAN", 0, "German (Deutsch)", "de_DE"},
{23, "GREEK", 0, "Greek (Ελληνικά)", "el_GR"},
/* {23, "GREEK", 0, "Greek (Ελληνικά)", "el_GR"},*/ /* XXX Not active nor enough translated. */
/* using the utf8 flipped form of Hebrew (עִבְרִית)) */
{33, "HEBREW", 0, "Hebrew (תירִבְעִ)", "he_IL"},
{31, "HUNGARIAN", 0, "Hungarian (Magyar)", "hu_HU"},
{27, "INDONESIAN", 0, "Indonesian (Bahasa indonesia)", "id_ID"},
{29, "KYRGYZ", 0, "Kyrgyz (Кыргыз тили)", "ky_KG"},
/* {24, "KOREAN", 0, "Korean (한국 언어)", "ko_KR"}, */ /* XXX No po's yet. */
{25, "NEPALI", 0, "Nepali (नेपाली)", "ne_NP"},
/* {24, "KOREAN", 0, "Korean (한국 언어)", "ko_KR"}, */ /* XXX Not active nor enough translated. */
/* {25, "NEPALI", 0, "Nepali (नेपाली)", "ne_NP"},*/ /* XXX Not active nor enough translated. */
/* using the utf8 flipped form of Persian (فارسی) */
{26, "PERSIAN", 0, "Persian (ﯽﺳﺭﺎﻓ)", "fa_IR"},
{19, "POLISH", 0, "Polish (Polski)", "pl_PL"},
/* {20, "ROMANIAN", 0, "Romanian (Român)", "ro_RO"}, */ /* XXX No po's yet. */
/* {19, "POLISH", 0, "Polish (Polski)", "pl_PL"},*/ /* XXX Not active nor enough translated. */
/* {20, "ROMANIAN", 0, "Romanian (Român)", "ro_RO"}, */ /* XXX Not active nor enough translated. */
{17, "SERBIAN", 0, "Serbian (Српски)", "sr_RS"},
{28, "SERBIAN_LATIN", 0, "Serbian Latin (Srpski latinica)", "sr_RS@latin"},
{ 7, "SWEDISH", 0, "Swedish (Svenska)", "sv_SE"},