[ppwcode] r6816 committed - bundleName instead of bundle

[ppw...@googlecode.com]

Revision: 6816
Author: jand...@gmail.com
Date: Sun May 19 16:04:37 2013
Log: bundleName instead of bundle
http://code.google.com/p/ppwcode/source/detail?r=6816

Modified:
/javascript/util/oddsAndEnds/trunk/src/oddsAndEnds/ui/MultiLangLabel.js

/javascript/util/oddsAndEnds/trunk/src/oddsAndEnds/ui/_MultiLangLabelParent.js

=======================================
--- /javascript/util/oddsAndEnds/trunk/src/oddsAndEnds/ui/MultiLangLabel.js
Sun May 19 14:35:01 2013
+++ /javascript/util/oddsAndEnds/trunk/src/oddsAndEnds/ui/MultiLangLabel.js
Sun May 19 16:04:37 2013
@@ -7,7 +7,7 @@
// when multiple languages must be shown, and the language can
change dynamically.
// We need to set
// - nlsParentDirectory: the directory containing the used nls
directory
- // - bundle: the name of the i18n file
+ // - bundleName: the name of the i18n file
// - label: the name of the property in that file to show
// - lang; the locale, which can change
//
@@ -122,7 +122,7 @@

var render = this.missing;
var nlsParentDir = lookup(this, "nlsParentDirectory");
- var bundle = lookup(this, "bundle");
+ var bundle = lookup(this, "bundleName");
var lang = lookup(this, "lang") || kernel.locale;
if (nlsParentDir && bundle && this.label) {
try {
@@ -130,7 +130,7 @@
render = labels[this.label];
}
catch (err) {
- console.info("INFO error while getting (" +
this.nlsParentDirectory + "/nls/" + this.bundle + ")." +
+ console.info("INFO error while getting (" +
this.nlsParentDirectory + "/nls/" + this.bundleName + ")." +
this.label + " for locale '" + this.lang + "': " +
err.message + " -- rendering missing ('" + this.missing + "')");
}
}
=======================================
---
/javascript/util/oddsAndEnds/trunk/src/oddsAndEnds/ui/_MultiLangLabelParent.js
Sun May 19 14:35:01 2013
+++
/javascript/util/oddsAndEnds/trunk/src/oddsAndEnds/ui/_MultiLangLabelParent.js
Sun May 19 16:04:37 2013
@@ -1,11 +1,11 @@
-define(["dojo/_base/declare", "dijit/_WidgetBase", "dojo/_base/kernel", "dojo/i18n", "../xml"],
+define(["dojo/_base/declare", "dijit/_WidgetBase", "dojo/_base/kernel"],
function(declare, _WidgetBase, kernel) {

var _MultiLangLabelParent = declare([_WidgetBase], {
// summary:
// Optional parent for MultiLangParent. We can set
// - nlsParentDirectory: the directory containing the used nls
directory
- // - bundle: the name of the i18n file
+ // - bundleName: the name of the i18n file
// - lang; the locale, which can change
//
// All locales must be defined as extraLocale in dojoConfig.
@@ -17,8 +17,8 @@
// nlsParentDirectory: String?
nlsParentDirectory: null,

- // bundle: String?
- bundle: null,
+ // bundleName: String?
+ bundleName: null,

lang: kernel.locale, // default language is browser dependent