[qooxdoo-commit] SF.net SVN: qooxdoo: [5202] trunk/qooxdoo/frontend
Brought to you by:
ecker,
martinwittemann
Menu
▾
▴
[qooxdoo-commit] SF.net SVN: qooxdoo: [5202] trunk/qooxdoo/frontend
|
From: <fj...@us...> - 2006-12-13 13:21:03
|
Revision: 5202
http://svn.sourceforge.net/qooxdoo/?rev=5202&view=rev
Author: fjakobs
Date: 2006-12-13 05:20:49 -0800 (Wed, 13 Dec 2006)
Log Message:
-----------
reorganize locale
Modified Paths:
--------------
trunk/qooxdoo/frontend/demo/feedreader/source/class/feedreader/Application.js
trunk/qooxdoo/frontend/demo/feedreader/source/translation/de.po
trunk/qooxdoo/frontend/framework/source/class/qx/Locale.js
trunk/qooxdoo/frontend/framework/source/class/qx/core/Object.js
trunk/qooxdoo/frontend/framework/source/class/qx/locale/Date.js
trunk/qooxdoo/frontend/framework/source/class/qx/ui/basic/Atom.js
trunk/qooxdoo/frontend/framework/source/class/qx/ui/basic/Label.js
trunk/qooxdoo/frontend/framework/source/class/qx/ui/component/DateChooser.js
trunk/qooxdoo/frontend/framework/source/class/qx/ui/menu/Button.js
Added Paths:
-----------
trunk/qooxdoo/frontend/framework/source/class/qx/locale/manager/LocalizedString.js
trunk/qooxdoo/frontend/framework/source/class/qx/locale/manager/Manager.js
Removed Paths:
-------------
trunk/qooxdoo/frontend/framework/source/class/qx/locale/LocalizedString.js
trunk/qooxdoo/frontend/framework/source/class/qx/locale/Manager.js
Modified: trunk/qooxdoo/frontend/demo/feedreader/source/class/feedreader/Application.js
===================================================================
--- trunk/qooxdoo/frontend/demo/feedreader/source/class/feedreader/Application.js 2006-12-13 12:59:50 UTC (rev 5201)
+++ trunk/qooxdoo/frontend/demo/feedreader/source/class/feedreader/Application.js 2006-12-13 13:20:49 UTC (rev 5202)
@@ -57,11 +57,11 @@
qx.Class._feedDesc = [
{
url: "./resource/feeds/qooxdoo-news.xml",
- name: "qooxdoo-news"
+ name: "qooxdoo-blog"
},
{
url: "./resource/feeds/qooxdoo-blog.xml",
- name: "qooxdoo-blog"
+ name: "qooxdoo-news"
},
{
url: "./resource/feeds/ajaxian.xml",
@@ -78,11 +78,11 @@
qx.Class._feedDesc = [
{
url: "./resource/proxy/proxy.php?proxy=" + encodeURIComponent("http://feeds.feedburner.com/qooxdoo/blog/content"),
- name: "qooxdoo-news"
+ name: "qooxdoo-blog"
},
{
url: "./resource/proxy/proxy.php?proxy=" + encodeURIComponent("http://feeds.feedburner.com/qooxdoo/news/content"),
- name: "qooxdoo-blog"
+ name: "qooxdoo-news"
},
{
url: "./resource/proxy/proxy.php?proxy=" + encodeURIComponent("http://feeds.feedburner.com/ajaxian"),
@@ -136,7 +136,7 @@
toolBar.add(new qx.ui.basic.HorizontalSpacer());
- var locale = qx.nls.Manager.getInstance().getLocale();
+ var locale = qx.locale.manager.Manager.getInstance().getLocale();
var mb_de = new qx.ui.menu.RadioButton(this.tr("German"), null, locale == "de" );
mb_de.setUserData("locale", "de");
var mb_en = new qx.ui.menu.RadioButton(this.tr("English"), null, locale == "en");
@@ -145,7 +145,7 @@
var radioManager = new qx.manager.selection.RadioManager("lang", [mb_de, mb_en]);
radioManager.addEventListener("changeSelected", function(e) {
var lang = e.getData().getUserData("locale");
- qx.nls.Manager.getInstance().setLocale(lang);
+ qx.locale.manager.Manager.getInstance().setLocale(lang);
});
lang_menu.add(mb_de, mb_en);
lang_menu.addToDocument();
Modified: trunk/qooxdoo/frontend/demo/feedreader/source/translation/de.po
===================================================================
--- trunk/qooxdoo/frontend/demo/feedreader/source/translation/de.po 2006-12-13 12:59:50 UTC (rev 5201)
+++ trunk/qooxdoo/frontend/demo/feedreader/source/translation/de.po 2006-12-13 13:20:49 UTC (rev 5202)
@@ -1,15 +1,15 @@
# translation of de.po to German
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
-#
+#
# Fabian Jakobs <fab...@we...>, 2006.
msgid ""
msgstr ""
"Project-Id-Version: de\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-11 13:30+0100\n"
-"PO-Revision-Date: 2006-12-08 12:28+0100\n"
-"Last-Translator: Fabian Jakobs <fab...@1u...>\n"
+"POT-Creation-Date: 2006-12-12 18:08+0100\n"
+"PO-Revision-Date: 2006-12-12 13:47+0100\n"
+"Last-Translator: Fabian Jakobs <fab...@we...>\n"
"Language-Team: German <en...@li...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -44,31 +44,31 @@
msgid "(%1) Reload the feeds."
msgstr "(%1) Feeds aktualisieren."
-#: source/class//feedreader/Application.js:148
+#: source/class//feedreader/Application.js:140
msgid "German"
msgstr "Deutsch"
-#: source/class//feedreader/Application.js:150
+#: source/class//feedreader/Application.js:142
msgid "English"
-msgstr ""
+msgstr "Englisch"
-#: source/class//feedreader/Application.js:162
+#: source/class//feedreader/Application.js:154
msgid "Help"
msgstr "Hilfe"
-#: source/class//feedreader/Application.js:169
+#: source/class//feedreader/Application.js:161
msgid "News feeds"
msgstr "Nachrichtenkanäle"
-#: source/class//feedreader/Application.js:189
+#: source/class//feedreader/Application.js:182
msgid "Subject"
msgstr "Betreff"
-#: source/class//feedreader/Application.js:190
+#: source/class//feedreader/Application.js:183
msgid "Sender"
msgstr "Absender"
-#: source/class//feedreader/Application.js:191
+#: source/class//feedreader/Application.js:184
msgid "Date"
msgstr "Datum"
@@ -76,12 +76,5 @@
msgid "read more ..."
msgstr "weitere Informationen ..."
-#, fuzzy
-#~ msgid "realoding ..."
-#~ msgstr "aktualisieren ..."
-
-#~ msgid "Reload feed data"
-#~ msgstr "Feed Daten aktualisieren"
-
-#~ msgid "Fancy button"
-#~ msgstr "Toller Button"
+#~ msgid "completed"
+#~ msgstr "ferig"
Modified: trunk/qooxdoo/frontend/framework/source/class/qx/Locale.js
===================================================================
--- trunk/qooxdoo/frontend/framework/source/class/qx/Locale.js 2006-12-13 12:59:50 UTC (rev 5201)
+++ trunk/qooxdoo/frontend/framework/source/class/qx/Locale.js 2006-12-13 13:20:49 UTC (rev 5202)
@@ -73,7 +73,7 @@
}
vParentPackage[vPartName] = definition;
- qx.nls.Manager.getInstance().addTranslation(vPartName, definition);
+ qx.locale.manager.Manager.getInstance().addTranslation(vPartName, definition);
arguments.callee.statics._registry[fullname] = definition;
},
Modified: trunk/qooxdoo/frontend/framework/source/class/qx/core/Object.js
===================================================================
--- trunk/qooxdoo/frontend/framework/source/class/qx/core/Object.js 2006-12-13 12:59:50 UTC (rev 5201)
+++ trunk/qooxdoo/frontend/framework/source/class/qx/core/Object.js 2006-12-13 13:20:49 UTC (rev 5202)
@@ -289,10 +289,10 @@
*
* @param messageId (string) message id (may contain format strings)
* @param varargs (object) variable number of argumes applied to the format string
- * @return (qx.nls.LocalizedString)
+ * @return (qx.locale.manager.LocalizedString)
*/
qx.Proto.tr = function(messageId, varargs) {
- var nlsManager = qx.nls.Manager.getInstance();
+ var nlsManager = qx.locale.manager.Manager.getInstance();
return nlsManager.tr.apply(nlsManager, arguments);
};
@@ -309,10 +309,10 @@
* @param pluralMessageId (string) message id of the plural form (may contain format strings)
* @param count (integer) if greater than 1 the plural form otherwhise the singular form is returned.
* @param varargs (object) variable number of argumes applied to the format string
- * @return (qx.nls.LocalizedString)
+ * @return (qx.locale.manager.LocalizedString)
*/
qx.Proto.trn = function(singularMessageId, pluralMessageId, count, varargs) {
- var nlsManager = qx.nls.Manager.getInstance();
+ var nlsManager = qx.locale.manager.Manager.getInstance();
return nlsManager.trn.apply(nlsManager, arguments);
};
Modified: trunk/qooxdoo/frontend/framework/source/class/qx/locale/Date.js
===================================================================
--- trunk/qooxdoo/frontend/framework/source/class/qx/locale/Date.js 2006-12-13 12:59:50 UTC (rev 5201)
+++ trunk/qooxdoo/frontend/framework/source/class/qx/locale/Date.js 2006-12-13 13:20:49 UTC (rev 5202)
@@ -4,11 +4,11 @@
qx.OO.defineClass("qx.nls.Date");
qx.Class.getAmMarker = function(locale) {
- return qx.nls.Manager.getInstance().localize("cldr_am_marker", locale);
+ return qx.locale.manager.Manager.getInstance().localize("cldr_am_marker", locale);
};
qx.Class.getPmMarker = function(locale) {
- return qx.nls.Manager.getInstance().localize("cldr_am_marker", locale);
+ return qx.locale.manager.Manager.getInstance().localize("cldr_am_marker", locale);
};
qx.Class.getShortDayNames = function(locale) {
Deleted: trunk/qooxdoo/frontend/framework/source/class/qx/locale/LocalizedString.js
===================================================================
--- trunk/qooxdoo/frontend/framework/source/class/qx/locale/LocalizedString.js 2006-12-13 12:59:50 UTC (rev 5201)
+++ trunk/qooxdoo/frontend/framework/source/class/qx/locale/LocalizedString.js 2006-12-13 13:20:49 UTC (rev 5202)
@@ -1,45 +0,0 @@
-/**
- * Create a new instance of qx.nls.LocalizedString
- *
- * @see(qx.lang.String.format)
- *
- * @param messageId (string) message id (may contain format strings)
- * @param args (object[]) array of objects, which are inserted into the format string.
- */
-qx.OO.defineClass("qx.nls.LocalizedString", qx.core.Object,
-function(messageId, args) {
- qx.core.Object.call(this);
-
- this.setId(messageId);
-
- var storedArguments = [];
- for (var i=0; i<args.length; args++) {
- var arg = args[i];
- if (arg instanceof qx.nls.LocalizedString) {
- // defer convertion to string
- storedArguments.push(arg);
- } else {
- // force convertion to string
- storedArguments.push(arg + "");
- }
- }
- this.setArgs(storedArguments);
-});
-
-
-/** message id */
-qx.OO.addProperty({ name: "id"});
-
-/** list of arguments to be applied to the format string */
-qx.OO.addProperty({ name: "args"});
-
-
-/**
- * Return translation of the string using the current locale
- *
- * @return (string) translation using the current locale
- */
-qx.Proto.toString = function () {
- return qx.nls.Manager.getInstance().translate(this.getId(), this.getArgs());
-}
-
Deleted: trunk/qooxdoo/frontend/framework/source/class/qx/locale/Manager.js
===================================================================
--- trunk/qooxdoo/frontend/framework/source/class/qx/locale/Manager.js 2006-12-13 12:59:50 UTC (rev 5201)
+++ trunk/qooxdoo/frontend/framework/source/class/qx/locale/Manager.js 2006-12-13 13:20:49 UTC (rev 5202)
@@ -1,171 +0,0 @@
-/**
- * Create a new instance of qx.nls.Manager
- */
-qx.OO.defineClass("qx.nls.Manager", qx.manager.object.ObjectManager,
-function() {
- qx.manager.object.ObjectManager.call(this);
-
- this._translationCatalog = { C: true };
- this.setLocale(qx.sys.Client.getInstance().getLocale() || this._defaultLanguage);
-});
-
-
-/** current locale. locale is an language code like de, de_AT, en, en_GB, fr, ... */
-qx.OO.addProperty({ name: "locale"});
-
-
-qx.Proto._modifyLocale = function(propValue, propOldValue, propData) {
- this._language = propValue;
-
- var pos = propValue.indexOf("_");
- if (pos == -1) {
- this._majorLanguage = propValue;
- } else {
- this._majorLanguage = propValue.substring(0, pos);
- }
-
- return true;
-};
-
-
-/**
- * Add a translation to the translation manager
- *
- * @param languageCode (string) language code of the translation like de, de_AT, en, en_GB, fr, ...
- * @param translationMap (Map) mapping of message identifiers (english text) to the target language
- */
-qx.Proto.addTranslation = function(languageCode, translationMap) {
-
- if (this._translationCatalog[languageCode])
- {
- for (var key in translationMap) {
- this._translationCatalog[languageCode][key] = translationMap[key];
- }
- }
- else
- {
- this._translationCatalog[languageCode] = translationMap;
- }
-};
-
-
-/**
- * Translate a message
- * @see(qx.lang.String.format)
- *
- * @param messageId (string) message id (may contain format strings)
- * @param varargs (object) variable number of argumes applied to the format string
- * @return (qx.nls.LocalizedString)
- */
-qx.Proto.tr = function(messageId, varargs)
-{
- var args = qx.lang.Array.fromArguments(arguments);
- args.splice(0, 1);
-
- return new qx.nls.LocalizedString(messageId, args);
-};
-
-
-/**
- * Translate a plural message
- *
- * Depending on the third argument the plursl or the singular form is chosen.
- *
- * @see(qx.lang.String.format)
- *
- * @param singularMessageId (string) message id of the singular form (may contain format strings)
- * @param pluralMessageId (string) message id of the plural form (may contain format strings)
- * @param count (integer) if greater than 1 the plural form otherwhise the singular form is returned.
- * @param varargs (object) variable number of argumes applied to the format string
- * @return (qx.nls.LocalizedString)
- */
-qx.Proto.trn = function(singularMessageId, pluralMessageId, count, varargs)
-{
- var args = qx.lang.Array.fromArguments(arguments);
- args.splice(0, 3);
-
- if (count > 1)
- {
- return new qx.nls.LocalizedString(pluralMessageId, args);
- }
- else
- {
- return new qx.nls.LocalizedString(singularMessageId, args);
- }
-};
-
-
-/**
- * Translate a message with translation hint
- *
- * Depending on the third argument the plursl or the singular form is chosen.
- *
- * @see(qx.lang.String.format)
- *
- * @param hint (string) hint for the translator of the message. Will be included in the .pot file.
- * @param messageId (string) message id (may contain format strings)
- * @param varargs (object) variable number of argumes applied to the format string
- * @return (qx.nls.LocalizedString)
- */
-qx.Proto.trc = function(hint, messageId, varargs)
-{
- var args = qx.lang.Array.fromArguments(arguments);
- args.splice(0, 2);
-
- return new qx.nls.LocalizedString(messageId, args);
-}
-
-
-
-
-
-
-
-
-qx.Proto._defaultLanguage = "C";
-
-
-/**
- * Translate a message using the current locale and apply format string to the arguments.
- *
- * @param messageId (string) message id (may contain format strings)
- * @param args (object[]) array of objects, which are inserted into the format string.
- * @return (string) translated message.
- */
-qx.Proto.translate = function(messageId, args)
-{
- var txt;
-
- if (!txt && this._translationCatalog[this._language]) {
- txt = this._translationCatalog[this._language][messageId];
- }
-
- if (!txt && this._translationCatalog[this._majorLanguage]) {
- txt = this._translationCatalog[this._majorLanguage][messageId];
- }
-
- if (!txt && this._translationCatalog[this._defaultLanguage]) {
- txt = this._translationCatalog[this._defaultLanguage][messageId];
- }
-
- if (!txt) {
- txt = messageId;
- }
-
- if (args.length > 0) {
- txt = qx.lang.String.format(txt, args)
- }
- return txt;
-};
-
-
-/*
----------------------------------------------------------------------------
- DEFER SINGLETON INSTANCE
----------------------------------------------------------------------------
-*/
-
-/**
- * Singleton Instance Getter
- */
-qx.Class.getInstance = qx.util.Return.returnInstance;
\ No newline at end of file
Copied: trunk/qooxdoo/frontend/framework/source/class/qx/locale/manager/LocalizedString.js (from rev 5200, trunk/qooxdoo/frontend/framework/source/class/qx/locale/LocalizedString.js)
===================================================================
--- trunk/qooxdoo/frontend/framework/source/class/qx/locale/manager/LocalizedString.js (rev 0)
+++ trunk/qooxdoo/frontend/framework/source/class/qx/locale/manager/LocalizedString.js 2006-12-13 13:20:49 UTC (rev 5202)
@@ -0,0 +1,45 @@
+/**
+ * Create a new instance of qx.locale.manager.LocalizedString
+ *
+ * @see(qx.lang.String.format)
+ *
+ * @param messageId (string) message id (may contain format strings)
+ * @param args (object[]) array of objects, which are inserted into the format string.
+ */
+qx.OO.defineClass("qx.locale.manager.LocalizedString", qx.core.Object,
+function(messageId, args) {
+ qx.core.Object.call(this);
+
+ this.setId(messageId);
+
+ var storedArguments = [];
+ for (var i=0; i<args.length; args++) {
+ var arg = args[i];
+ if (arg instanceof qx.locale.manager.LocalizedString) {
+ // defer convertion to string
+ storedArguments.push(arg);
+ } else {
+ // force convertion to string
+ storedArguments.push(arg + "");
+ }
+ }
+ this.setArgs(storedArguments);
+});
+
+
+/** message id */
+qx.OO.addProperty({ name: "id"});
+
+/** list of arguments to be applied to the format string */
+qx.OO.addProperty({ name: "args"});
+
+
+/**
+ * Return translation of the string using the current locale
+ *
+ * @return (string) translation using the current locale
+ */
+qx.Proto.toString = function () {
+ return qx.locale.manager.Manager.getInstance().translate(this.getId(), this.getArgs());
+}
+
Copied: trunk/qooxdoo/frontend/framework/source/class/qx/locale/manager/Manager.js (from rev 5200, trunk/qooxdoo/frontend/framework/source/class/qx/locale/Manager.js)
===================================================================
--- trunk/qooxdoo/frontend/framework/source/class/qx/locale/manager/Manager.js (rev 0)
+++ trunk/qooxdoo/frontend/framework/source/class/qx/locale/manager/Manager.js 2006-12-13 13:20:49 UTC (rev 5202)
@@ -0,0 +1,171 @@
+/**
+ * Create a new instance of qx.locale.manager.Manager
+ */
+qx.OO.defineClass("qx.locale.manager.Manager", qx.manager.object.ObjectManager,
+function() {
+ qx.manager.object.ObjectManager.call(this);
+
+ this._translationCatalog = { C: true };
+ this.setLocale(qx.sys.Client.getInstance().getLocale() || this._defaultLanguage);
+});
+
+
+/** current locale. locale is an language code like de, de_AT, en, en_GB, fr, ... */
+qx.OO.addProperty({ name: "locale"});
+
+
+qx.Proto._modifyLocale = function(propValue, propOldValue, propData) {
+ this._language = propValue;
+
+ var pos = propValue.indexOf("_");
+ if (pos == -1) {
+ this._majorLanguage = propValue;
+ } else {
+ this._majorLanguage = propValue.substring(0, pos);
+ }
+
+ return true;
+};
+
+
+/**
+ * Add a translation to the translation manager
+ *
+ * @param languageCode (string) language code of the translation like de, de_AT, en, en_GB, fr, ...
+ * @param translationMap (Map) mapping of message identifiers (english text) to the target language
+ */
+qx.Proto.addTranslation = function(languageCode, translationMap) {
+
+ if (this._translationCatalog[languageCode])
+ {
+ for (var key in translationMap) {
+ this._translationCatalog[languageCode][key] = translationMap[key];
+ }
+ }
+ else
+ {
+ this._translationCatalog[languageCode] = translationMap;
+ }
+};
+
+
+/**
+ * Translate a message
+ * @see(qx.lang.String.format)
+ *
+ * @param messageId (string) message id (may contain format strings)
+ * @param varargs (object) variable number of argumes applied to the format string
+ * @return (qx.locale.manager.LocalizedString)
+ */
+qx.Proto.tr = function(messageId, varargs)
+{
+ var args = qx.lang.Array.fromArguments(arguments);
+ args.splice(0, 1);
+
+ return new qx.locale.manager.LocalizedString(messageId, args);
+};
+
+
+/**
+ * Translate a plural message
+ *
+ * Depending on the third argument the plursl or the singular form is chosen.
+ *
+ * @see(qx.lang.String.format)
+ *
+ * @param singularMessageId (string) message id of the singular form (may contain format strings)
+ * @param pluralMessageId (string) message id of the plural form (may contain format strings)
+ * @param count (integer) if greater than 1 the plural form otherwhise the singular form is returned.
+ * @param varargs (object) variable number of argumes applied to the format string
+ * @return (qx.locale.manager.LocalizedString)
+ */
+qx.Proto.trn = function(singularMessageId, pluralMessageId, count, varargs)
+{
+ var args = qx.lang.Array.fromArguments(arguments);
+ args.splice(0, 3);
+
+ if (count > 1)
+ {
+ return new qx.locale.manager.LocalizedString(pluralMessageId, args);
+ }
+ else
+ {
+ return new qx.locale.manager.LocalizedString(singularMessageId, args);
+ }
+};
+
+
+/**
+ * Translate a message with translation hint
+ *
+ * Depending on the third argument the plursl or the singular form is chosen.
+ *
+ * @see(qx.lang.String.format)
+ *
+ * @param hint (string) hint for the translator of the message. Will be included in the .pot file.
+ * @param messageId (string) message id (may contain format strings)
+ * @param varargs (object) variable number of argumes applied to the format string
+ * @return (qx.locale.manager.LocalizedString)
+ */
+qx.Proto.trc = function(hint, messageId, varargs)
+{
+ var args = qx.lang.Array.fromArguments(arguments);
+ args.splice(0, 2);
+
+ return new qx.locale.manager.LocalizedString(messageId, args);
+}
+
+
+
+
+
+
+
+
+qx.Proto._defaultLanguage = "C";
+
+
+/**
+ * Translate a message using the current locale and apply format string to the arguments.
+ *
+ * @param messageId (string) message id (may contain format strings)
+ * @param args (object[]) array of objects, which are inserted into the format string.
+ * @return (string) translated message.
+ */
+qx.Proto.translate = function(messageId, args)
+{
+ var txt;
+
+ if (!txt && this._translationCatalog[this._language]) {
+ txt = this._translationCatalog[this._language][messageId];
+ }
+
+ if (!txt && this._translationCatalog[this._majorLanguage]) {
+ txt = this._translationCatalog[this._majorLanguage][messageId];
+ }
+
+ if (!txt && this._translationCatalog[this._defaultLanguage]) {
+ txt = this._translationCatalog[this._defaultLanguage][messageId];
+ }
+
+ if (!txt) {
+ txt = messageId;
+ }
+
+ if (args.length > 0) {
+ txt = qx.lang.String.format(txt, args)
+ }
+ return txt;
+};
+
+
+/*
+---------------------------------------------------------------------------
+ DEFER SINGLETON INSTANCE
+---------------------------------------------------------------------------
+*/
+
+/**
+ * Singleton Instance Getter
+ */
+qx.Class.getInstance = qx.util.Return.returnInstance;
\ No newline at end of file
Modified: trunk/qooxdoo/frontend/framework/source/class/qx/ui/basic/Atom.js
===================================================================
--- trunk/qooxdoo/frontend/framework/source/class/qx/ui/basic/Atom.js 2006-12-13 12:59:50 UTC (rev 5201)
+++ trunk/qooxdoo/frontend/framework/source/class/qx/ui/basic/Atom.js 2006-12-13 13:20:49 UTC (rev 5202)
@@ -305,7 +305,7 @@
{
case qx.ui.basic.Atom.SHOW_LABEL:
case qx.ui.basic.Atom.SHOW_BOTH:
- this._labelIsVisible = qx.util.Validation.isValidString(this.getLabel()) || this.getLabel() instanceof qx.nls.LocalizedString;
+ this._labelIsVisible = qx.util.Validation.isValidString(this.getLabel()) || this.getLabel() instanceof qx.locale.manager.LocalizedString;
break;
default:
Modified: trunk/qooxdoo/frontend/framework/source/class/qx/ui/basic/Label.js
===================================================================
--- trunk/qooxdoo/frontend/framework/source/class/qx/ui/basic/Label.js 2006-12-13 12:59:50 UTC (rev 5201)
+++ trunk/qooxdoo/frontend/framework/source/class/qx/ui/basic/Label.js 2006-12-13 13:20:49 UTC (rev 5202)
@@ -239,7 +239,7 @@
qx.Proto._modifyHtml = function(propValue, propOldValue, propData)
{
- this._localized = this.getHtml() instanceof qx.nls.LocalizedString;
+ this._localized = this.getHtml() instanceof qx.locale.manager.LocalizedString;
this._updateHtml();
return true;
}
@@ -249,13 +249,13 @@
if (this._localized)
{
this._htmlContent = this.getHtml().toString();
- qx.nls.Manager.getInstance().addEventListener("changeLocale", this._updateHtml, this);
+ qx.locale.manager.Manager.getInstance().addEventListener("changeLocale", this._updateHtml, this);
}
else
{
this._htmlContent = this.getHtml() || "";
- qx.nls.Manager.getInstance().remove(this);
- qx.nls.Manager.getInstance().removeEventListener("changeLocale", this._updateHtml, this);
+ qx.locale.manager.Manager.getInstance().remove(this);
+ qx.locale.manager.Manager.getInstance().removeEventListener("changeLocale", this._updateHtml, this);
}
this._htmlMode = qx.util.Validation.isValidString(this._htmlContent) && this._htmlContent.match(/<.*>/) ? true : false;
Modified: trunk/qooxdoo/frontend/framework/source/class/qx/ui/component/DateChooser.js
===================================================================
--- trunk/qooxdoo/frontend/framework/source/class/qx/ui/component/DateChooser.js 2006-12-13 12:59:50 UTC (rev 5201)
+++ trunk/qooxdoo/frontend/framework/source/class/qx/ui/component/DateChooser.js 2006-12-13 13:20:49 UTC (rev 5202)
@@ -458,11 +458,8 @@
* {qx.util.format.DateFormat} The format for the date year
* label at the top center.
*/
-qx.Class.MONTH_YEAR_FORMAT = new qx.util.format.DateFormat("yyyyMMMM", "de_AT");
+qx.Class.MONTH_YEAR_FORMAT = qx.util.DateFormat.getDateTimeFormat("MMMM yyyy");
-qx.Class.MONTH_YEAR_FORMAT = this.lo("dateTimeFormats", "yyyyMMMM");
-qx.Class.MONTH_YEAR_FORMAT = qx.util.DateFormat.getDateTimeFormat("yyyyMMMM");
-
/**
* {qx.util.format.DateFormat} The format for the weekday
* labels (the headers of the date table).
Modified: trunk/qooxdoo/frontend/framework/source/class/qx/ui/menu/Button.js
===================================================================
--- trunk/qooxdoo/frontend/framework/source/class/qx/ui/menu/Button.js 2006-12-13 12:59:50 UTC (rev 5201)
+++ trunk/qooxdoo/frontend/framework/source/class/qx/ui/menu/Button.js 2006-12-13 13:20:49 UTC (rev 5202)
@@ -223,11 +223,11 @@
{
this._labelObject.setHtml(propValue);
- if ((typeof propValue == "string" && propValue != "") || propValue instanceof qx.nls.LocalizedString)
+ if ((typeof propValue == "string" && propValue != "") || propValue instanceof qx.locale.manager.LocalizedString)
{
this._hasLabel = true;
- if (!((typeof propOldValue == "string" && propOldValue != "") || propOldValue instanceof qx.nls.LocalizedString)) {
+ if (!((typeof propOldValue == "string" && propOldValue != "") || propOldValue instanceof qx.locale.manager.LocalizedString)) {
this.addAt(this._labelObject, this.getFirstChild() == this._iconObject ? 1 : 0);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|