[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
cblu
cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 05:51:49 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 48557dd092f435401fcfd573be888e37229a25a7
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Nov 7 02:44:23 2001 +0000
i18n now fetches WebKit's localized strings
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@417 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/kwq/KWQKLocale.mm b/WebCore/kwq/KWQKLocale.mm
index 44cd5db..fc3ec6c 100644
--- a/WebCore/kwq/KWQKLocale.mm
+++ b/WebCore/kwq/KWQKLocale.mm
@@ -23,15 +23,15 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <kwqdebug.h>
-
#include <qstring.h>
-
#include <klocale.h>
QString i18n(const char* text)
{
- // FIXME! Need to add support for localization.
- return QString (text);
+ NSBundle *wkBundle = [NSBundle bundleWithIdentifier:@"com.apple.webkit"];
+ NSString *locString = [wkBundle localizedStringForKey:[NSString stringWithCString:text] value:nil table:nil];
+
+ return NSSTRING_TO_QSTRING(locString);
}
QString KLocale::language() const
diff --git a/WebCore/src/kwq/KWQKLocale.mm b/WebCore/src/kwq/KWQKLocale.mm
index 44cd5db..fc3ec6c 100644
--- a/WebCore/src/kwq/KWQKLocale.mm
+++ b/WebCore/src/kwq/KWQKLocale.mm
@@ -23,15 +23,15 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <kwqdebug.h>
-
#include <qstring.h>
-
#include <klocale.h>
QString i18n(const char* text)
{
- // FIXME! Need to add support for localization.
- return QString (text);
+ NSBundle *wkBundle = [NSBundle bundleWithIdentifier:@"com.apple.webkit"];
+ NSString *locString = [wkBundle localizedStringForKey:[NSString stringWithCString:text] value:nil table:nil];
+
+ return NSSTRING_TO_QSTRING(locString);
}
QString KLocale::language() const
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list