diff options
author | Eike Rathke <erack@redhat.com> | 2018-01-23 19:42:07 +0100 |
---|---|---|
committer | Eike Rathke <erack@redhat.com> | 2018-01-23 19:44:01 +0100 |
commit | 429072614e3c1d4bc0f9ca706414a43040464fe4 (patch) | |
tree | 127678d54d1882ba7ef28fdb237b0a2a92a2ab44 | |
parent | cceaece18a42405190941865908636522e0ee4cb (diff) |
Adapt to svtools/inc/langtab.hrc
svtools/source/misc/langtab.src is dead since a while.
Change-Id: I373f715d337a47f6ea1e935a7a50565f0e6b3ba2
-rwxr-xr-x | i18nlangtag/source/isolang/langid.pl | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/i18nlangtag/source/isolang/langid.pl b/i18nlangtag/source/isolang/langid.pl index 521a693795a2..ace514a839b3 100755 --- a/i18nlangtag/source/isolang/langid.pl +++ b/i18nlangtag/source/isolang/langid.pl @@ -29,7 +29,7 @@ sub Usage() print STDERR "\n", "langid - a hackish utility to lookup lang.h language defines and LangIDs,\n", - "isolang.cxx ISO639/ISO3166 mapping, locale data files, langtab.src language\n", + "isolang.cxx ISO639/ISO3166 mapping, locale data files, langtab.hrc language\n", "listbox entries, langlist.mk, file_ooo.scp registry name, languages.pm and\n", "msi-encodinglist.txt\n\n", @@ -41,7 +41,7 @@ sub Usage() "If the language string expression matches more than one define,\n", "e.g. as in 'german', all matching defines will be processed.\n", "If the language string does not match a define or an identifier in\n", - "langtab.src, a generic string match of the listbox entries will be tried.\n\n", + "langtab.hrc, a generic string match of the listbox entries will be tried.\n\n", "Numeric values of LangID,primarylanguage,sublanguage can be given\n", "decimal, hexadecimal (leading 0x), octal (leading 0) or binary (leading 0b).\n", @@ -423,16 +423,17 @@ sub main() "$SRC_ROOT", "i18nlangtag", "source/isolang/mslangid.cxx", 1, ()); my $module = "svtools"; - my $name = "source/misc/langtab.src"; + my $name = "inc/langtab.hrc"; + # { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Afrikaans (South Africa)") , LANGUAGE_AFRIKAANS }, # < "Afrikaans" ; LANGUAGE_AFRIKAANS ; > ; # lookup define @resultlist = grepFile( - $modifier . '^\s*<\s*".*"\s*;\s*.*' . $grepdef . '.*\s*;\s*>\s*;', + $modifier . '^\s*\{\s*NC_\(\s*"[^"]*"\s*,\s*".*"\s*\)\s*,.*' . $grepdef . '.*\}', "$SRC_ROOT", $module, $name, 1, ()); # lookup string if (!@resultlist) { grepFile( - $modifier . '^\s*<\s*".*' . $grepdef . '.*"\s*;\s*.*\s*;\s*>\s*;', + $modifier . '^\s*\{\s*NC_\(\s*"[^"]*"\s*,\s*".*' . $grepdef . '.*"\s*\)\s*,.*\}', "$SRC_ROOT", $module, $name, 1, ()); } for my $langtag (@langtaggreplist) |