summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorAndras Becsi <andras.becsi@digia.com>2014-10-10 18:31:53 +0200
committerAndras Becsi <andras.becsi@digia.com>2014-10-13 15:04:18 +0200
commit9861e57ecb97519d53f27f77784942964dcb2bf3 (patch)
tree44ca168a4d815b9c24d638258d20e8e29a26f4a6 /tools
parentd44b90f9fd7efada0153fbdb0433454e63167b82 (diff)
Fix localization on OS X
We did not load any localization data on OS X until now, so the error page did not have any strings, and some tests asserted because of missing localization. Change-Id: Icb6de1f7e3aaa6815483d379efaf00e8ed6a1dbf Reviewed-by: Michael Bruning <michael.bruning@digia.com>
Diffstat (limited to 'tools')
-rwxr-xr-xtools/buildscripts/repack_locales.py10
1 files changed, 1 insertions, 9 deletions
diff --git a/tools/buildscripts/repack_locales.py b/tools/buildscripts/repack_locales.py
index 05e2895ed..389e9b1fd 100755
--- a/tools/buildscripts/repack_locales.py
+++ b/tools/buildscripts/repack_locales.py
@@ -77,15 +77,7 @@ class Usage(Exception):
def calc_output(locale):
"""Determine the file that will be generated for the given locale."""
#e.g. '<(INTERMEDIATE_DIR)/repack/qtwebengine_locales/da.pak',
- if OS == 'mac' or OS == 'ios':
- # For Cocoa to find the locale at runtime, it needs to use '_' instead
- # of '-' (http://crbug.com/20441). Also, 'en-US' should be represented
- # simply as 'en' (http://crbug.com/19165, http://crbug.com/25578).
- if locale == 'en-US':
- locale = 'en'
- return '%s/repack/qtwebengine_locales/%s.lproj/locale.pak' % (INT_DIR, locale.replace('-', '_'))
- else:
- return os.path.join(INT_DIR, 'repack/qtwebengine_locales', locale + '.pak')
+ return os.path.join(INT_DIR, 'repack/qtwebengine_locales', locale + '.pak')
def calc_inputs(locale):