Merge pull request #12 from bryan-m-hughes/timob-11229

Timob 11229 i18n support
tidev · Oct 8, 2012 · 2a2e3c6 · 2a2e3c6
2 parents dfd0f73 + 396f2e6
commit 2a2e3c6
Show file tree

Hide file tree

Showing 16 changed files with 161 additions and 523 deletions.
diff --git a/lib/cli.js b/lib/cli.js
@@ -21,6 +21,9 @@ var	async = require('async'),
 	config = require('./config'),
 	semver = require('semver'),
 	appc = require('node-appc'),
+	i18n = appc.i18n(__dirname),
+	__ = i18n.__,
+	__n = i18n.__n,
 	afs = appc.fs,
 	hitch = appc.util.hitch,
 	mix = appc.util.mix,

diff --git a/lib/commands/config.js b/lib/commands/config.js
@@ -6,7 +6,10 @@
  */
 
 var config = require('../config'),
-	appc = require('node-appc');
+	appc = require('node-appc'),
+	i18n = appc.i18n(__dirname),
+	__ = i18n.__,
+	__n = i18n.__n;
 
 exports.desc = __('get and set config options');
 exports.extendedDesc = __('Gets and sets config options. If no key is specified, then all key/values are returned.\n\nThe config file is located at: %s', config.getConfigPath().cyan);

diff --git a/lib/commands/help.js b/lib/commands/help.js
@@ -6,6 +6,9 @@
  */
 
 var appc = require('node-appc'),
+	i18n = appc.i18n(__dirname),
+	__ = i18n.__,
+	__n = i18n.__n,
 	string = appc.string,
 	async = require('async'),
 	path = require('path');

diff --git a/lib/commands/info.js b/lib/commands/info.js
@@ -6,6 +6,9 @@
  */
 
 var appc = require('node-appc'),
+	i18n = appc.i18n(__dirname),
+	__ = i18n.__,
+	__n = i18n.__n,
 	env = appc.environ,
 	mix = appc.util.mix,
 	async = require('async'),

diff --git a/lib/commands/login.js b/lib/commands/login.js
@@ -5,7 +5,10 @@
  * See the LICENSE file for more information.
  */
 
-var appc = require('node-appc');
+var appc = require('node-appc'),
+	i18n = appc.i18n(__dirname),
+	__ = i18n.__,
+	__n = i18n.__n;
 
 exports.desc = __('logs into the Appcelerator network');
 

diff --git a/lib/commands/logout.js b/lib/commands/logout.js
@@ -5,7 +5,10 @@
  * See the LICENSE file for more information.
  */
 
-var appc = require('node-appc');
+var appc = require('node-appc'),
+	i18n = appc.i18n(__dirname),
+	__ = i18n.__,
+	__n = i18n.__n;
 
 exports.desc = __('logs out of the Appcelerator network');
 

diff --git a/lib/commands/module.js b/lib/commands/module.js
@@ -6,6 +6,9 @@
  */
 
 var appc = require('node-appc'),
+	i18n = appc.i18n(__dirname),
+	__ = i18n.__,
+	__n = i18n.__n,
 	afs = appc.fs,
 	path = require('path'),
 	platformNames = {

diff --git a/lib/commands/plugin.js b/lib/commands/plugin.js
@@ -6,6 +6,9 @@
  */
 
 var appc = require('node-appc'),
+	i18n = appc.i18n(__dirname),
+	__ = i18n.__,
+	__n = i18n.__n,
 	afs = appc.fs,
 	path = require('path'),
 	platformNames = {

diff --git a/lib/commands/sdk.js b/lib/commands/sdk.js
@@ -12,6 +12,9 @@ var async = require('async'),
 	wrench = require('wrench'),
 	prompt = require('prompt'),
 	appc = require('node-appc'),
+	i18n = appc.i18n(__dirname),
+	__ = i18n.__,
+	__n = i18n.__n,
 	addAnalyticsEvent,
 	urls = {
 		branches: 'http://builds.appcelerator.com.s3.amazonaws.com/mobile/branches.json',

diff --git a/lib/commands/setup.js b/lib/commands/setup.js
@@ -6,7 +6,10 @@
  */
 
 var config = require('../config'),
-	appc = require('node-appc');
+	appc = require('node-appc'),
+	i18n = appc.i18n(__dirname),
+	__ = i18n.__,
+	__n = i18n.__n;
 
 exports.desc = __('run the setup wizard');
 

diff --git a/lib/commands/status.js b/lib/commands/status.js
@@ -6,6 +6,9 @@
  */
 
 var appc = require('node-appc'),
+	i18n = appc.i18n(__dirname),
+	__ = i18n.__,
+	__n = i18n.__n,
 	async = require('async');
 
 exports.desc = __('displays session information');

diff --git a/lib/commands/version.js b/lib/commands/version.js
@@ -5,6 +5,11 @@
  * See the LICENSE file for more information.
  */
 
+var appc = require('node-appc'),
+	i18n = appc.i18n(__dirname),
+	__ = i18n.__,
+	__n = i18n.__n;
+
 exports.desc = __('print the version and exits');
 
 exports.config = function (logger, config, cli) {

diff --git a/lib/config.js b/lib/config.js
@@ -8,6 +8,9 @@
 var fs = require('fs'),
 	path = require('path'),
 	appc = require('node-appc'),
+	i18n = appc.i18n(__dirname),
+	__ = i18n.__,
+	__n = i18n.__n,
 	afs = appc.fs,
 	config = {
 		// default config

diff --git a/lib/titanium.js b/lib/titanium.js
@@ -7,6 +7,9 @@
 
 var config = require('./config').load(),
 	appc = require('node-appc'),
+	i18n = appc.i18n(__dirname),
+	__ = i18n.__,
+	__n = i18n.__n,
 	env = appc.environ,
 	afs = appc.fs,
 	fs = require('fs'),
@@ -34,13 +37,6 @@ global.tiexception = function (ex) {
 	}
 };
 
-// initialze i18n
-require('i18n').configure({
-	directory: path.join(module.filename, '..', '..', 'locales'),
-	register: global,
-	updateFiles: false
-});
-
 cli.addAnalyticsEvent = appc.analytics.addEvent;
 cli.sendAnalytics = sendAnalytics;