From 9861e57ecb97519d53f27f77784942964dcb2bf3 Mon Sep 17 00:00:00 2001
From: Andras Becsi <andras.becsi@digia.com>
Date: Fri, 10 Oct 2014 18:31:53 +0200
Subject: [PATCH] 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>
---
src/3rdparty | 2 +-
src/core/resource_bundle_qt.cpp | 9 ---------
tools/buildscripts/repack_locales.py | 10 +---------
3 files changed, 2 insertions(+), 19 deletions(-)
diff --git a/src/3rdparty b/src/3rdparty
index 2c3ccc799..1c64c9878 160000
--- a/src/3rdparty
+++ b/src/3rdparty
@@ -1 +1 @@
-Subproject commit 2c3ccc7994980d954ec0188ea3fa3d27424ef32e
+Subproject commit 1c64c9878f36c83b18c2e81aafe6eedc2a67488b
diff --git a/src/core/resource_bundle_qt.cpp b/src/core/resource_bundle_qt.cpp
index 2487cdbd1..d69ae05e1 100644
--- a/src/core/resource_bundle_qt.cpp
+++ b/src/core/resource_bundle_qt.cpp
@@ -47,15 +47,6 @@ void ResourceBundle::LoadCommonResources()
AddDataPackFromPath(WebEngineLibraryInfo::getPath(QT_RESOURCES_PAK), SCALE_FACTOR_100P);
}
-// As GetLocaleFilePath is excluded for Mac in resource_bundle.cc,
-// we have to add a replacement for it using the inverted logic.
-#if defined(OS_MACOSX)
-base::FilePath ResourceBundle::GetLocaleFilePath(const std::string& /*app_locale*/, bool /*test_file_exists*/)
-{
- return base::FilePath();
-}
-#endif
-
gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id, ImageRTL rtl)
{
LOG(WARNING) << "Unable to load image with id " << resource_id;
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):
--
GitLab