diff options
| author | thomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-02 21:31:57 +0000 |
|---|---|---|
| committer | thomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-02 21:31:57 +0000 |
| commit | 464dca7a6ff0f7649ec54fcac964306d07499c30 (patch) | |
| tree | 4dff0db9ea97395c0e0db6a594f2c5ddf08ae5f2 /chrome/app/tweak_mac_lproj_folders | |
| parent | e984058bf2de1d110a3ecca1c9b6a77e3f297704 (diff) | |
| download | chromium_src-464dca7a6ff0f7649ec54fcac964306d07499c30.zip chromium_src-464dca7a6ff0f7649ec54fcac964306d07499c30.tar.gz chromium_src-464dca7a6ff0f7649ec54fcac964306d07499c30.tar.bz2 | |
Even though the Finder's Get Info shows the language correctly when you use lproj folders with '-' instead of '_', Cocoa fails to load things at runtime from within them.
Map the names when writing lproj folders to use underscore.
Put an option on the helper script to control dash/underscore mapping since we need support for both.
TEST=try chinese and traditional chinese, they work now.
BUG=20441
Review URL: http://codereview.chromium.org/187011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25243 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/tweak_mac_lproj_folders')
| -rwxr-xr-x | chrome/app/tweak_mac_lproj_folders | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/chrome/app/tweak_mac_lproj_folders b/chrome/app/tweak_mac_lproj_folders index 78dba5b..9659e67 100755 --- a/chrome/app/tweak_mac_lproj_folders +++ b/chrome/app/tweak_mac_lproj_folders @@ -17,17 +17,22 @@ cd "${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}/Contents/Resources" # TODO: This can go away about 09/01/09, when they won't exist on the bots or # developers' local builds. rm -rf "zh.lproj" "en.lproj" +# Remove the invalid dirs with - instead of _ (http://crbug.com/20441) +# TODO: This can go away about 09/09/09, when they won't exist on the bots or +# developers' local builds. +rm -rf "en-GB.lproj" "en-US.lproj" "es-419.lproj" "pt-BR.lproj" "pt-PT.lproj" \ + "zh-CN.lproj" "zh-TW.lproj" -# Provide an link for en.lproj that points to en-US.lproj. +# Provide an link for en.lproj that points to en_US.lproj. # The standard OS language list includes English (en) and not a specific -# "flavor" such as U.S. English (en-US). When checking for a language match, +# "flavor" such as U.S. English (en_US). When checking for a language match, # the OS will remove subtags if no exact match is found, so that en will be # used if the user's preferred language list only contains British English -# (en-GB) and no specific en-GB translation is available. +# (en_GB) and no specific en_GB translation is available. # # To ensure that users with the default language list, which contains English # without any regional subtag, as well as users with a specific variant of # English with a regional subtag, will have access to an English-localized -# application, a symbolic link from en.lproj to en-US.lproj is provided. -ln -fhs "en-US.lproj" "en.lproj" +# application, a symbolic link from en.lproj to en_US.lproj is provided. +ln -fhs "en_US.lproj" "en.lproj" |