Refactoring for i18n.

kilisoria · kilisoria · commit 470f077ce6a9 · 2015-02-27T16:10:45.000-03:00
diff --git a/MarvelWorld-Cli/Brocfile.js b/MarvelWorld-Cli/Brocfile.js
@@ -21,7 +21,6 @@ app.import('bower_components/bootstrap/dist/css/bootstrap.css');
 app.import('bower_components/bootstrap/dist/css/bootstrap.css.map');
 app.import('bower_components/bootstrap/dist/js/bootstrap.min.js');
 app.import('bower_components/moment/moment.js');
-app.import('bower_components/ember-i18n/lib/i18n.js');
 
 
 module.exports = app.toTree();
diff --git a/MarvelWorld-Cli/app/controllers/movies/index.js b/MarvelWorld-Cli/app/controllers/movies/index.js
@@ -7,6 +7,9 @@ export default Ember.ArrayController.extend({
 	maxWatches: Ember.computed.max('watches'),
 	minWatches: Ember.computed.min('watches'),	
 	hasMovieAward: Ember.computed.any('model', 'award'),
+	name: function() {
+    	var a="";
+  	}.property(),
 	actions:{
 		seeAllActors:function(){
 			this.get('controllers.actors').send('showAllActors');
diff --git a/MarvelWorld-Cli/app/helpers/upper-case-i18n.js b/MarvelWorld-Cli/app/helpers/upper-case-i18n.js
@@ -1,5 +1,6 @@
 import Ember from 'ember';
 
+
 export default Ember.Handlebars.makeBoundHelper(function(key){
-	return  Ember.I18n.t(key).toUpperCase();
+	
 });
diff --git a/MarvelWorld-Cli/app/initializers/i18n.js b/MarvelWorld-Cli/app/initializers/i18n.js
diff --git a/MarvelWorld-Cli/app/locales/en.js b/MarvelWorld-Cli/app/locales/en.js
@@ -0,0 +1,12 @@
+export default {
+	movie:{
+		yes: "YES",
+		noExclamation: "NO!",
+		maxWatches: "(*) The movie with MAX watches has: ",
+   		minWatches: "(*) The movie with MIN watches has: ",
+   		viewers: "viewers.",
+   		award: "(*) Is there movie with awards?",   		
+	},
+	english: "English",
+	spain: "Spain"
+};
diff --git a/MarvelWorld-Cli/app/locales/es.js b/MarvelWorld-Cli/app/locales/es.js
@@ -0,0 +1,11 @@
+export default {
+	movie:{
+		name: "Movie",
+		yes: "SI",
+		noExclamation: "NO!",
+		maxWatches: "(*) La película con mayor cantidad de espectadores: ",
+   		minWatches: "(*) La película con menos cantidad de espectadores: ",
+   		viewers: "espectadores.",
+   		award: "(*) Hay peliculas con premiados?",
+	}
+};
diff --git a/MarvelWorld-Cli/app/routes/application.js b/MarvelWorld-Cli/app/routes/application.js
@@ -14,6 +14,17 @@ export default Ember.Route.extend({
 	        outlet: 'modal',
 	        parentView: 'application'
 	      });
-	    }
+	    },
+	 	setSpainLanguage: function(){
+			console.log("0001");
+		},
+		setEnglishLanguage: function(){
+
+			/*var set = Ember.set;			
+			var application = container.lookup('application:main');
+			set(application, 'locale', 'en');*/
+
+
+		}
   	}	
 });
diff --git a/MarvelWorld-Cli/app/styles/app.css b/MarvelWorld-Cli/app/styles/app.css
@@ -461,4 +461,27 @@ background: url('/assets/images/delete.png') no-repeat;
 .info-modal-button-container{
 	bottom: 8px;
 	position: absolute;
+}
+
+.languages-container{
+    float: left;
+    margin-left: 6px;
+    margin-top: 2px;
+}
+
+.spain-language{	
+	background: url("/assets/images/spain-flag.png") no-repeat scroll 0 0 / cover rgba(0, 0, 0, 0);
+	float: left;
+	width: 16px;
+	height: 16px;	
+	cursor: pointer;
+}
+
+.english-language{
+	background: url("/assets/images/us-flag.png") no-repeat scroll 0 0 / cover rgba(0, 0, 0, 0);
+ 	float: left;
+    height: 16px;
+    margin-left: 4px;
+    width: 16px;
+    cursor: pointer;
 }
diff --git a/MarvelWorld-Cli/app/templates/layouts/main.hbs b/MarvelWorld-Cli/app/templates/layouts/main.hbs
@@ -6,7 +6,11 @@
 		{{#link-to "tv" class="btn btn-primary btn-lg"}}TV{{/link-to}}
 		{{#link-to "events" class="btn btn-primary btn-lg"}}Events{{/link-to}}			
 	<div class="current-date">
-		{{current-date}}	
+		{{current-date}}			
+	</div>
+	<div class="languages-container">
+		<div class="spain-language" {{action "setSpainLanguage"}}></div>
+		<div class="english-language" {{action "setEnglishLanguage"}}></div>
 	</div>
 </div>
 
diff --git a/MarvelWorld-Cli/app/templates/movies/index.hbs b/MarvelWorld-Cli/app/templates/movies/index.hbs
@@ -1,6 +1,6 @@
 {{partial "layouts/main"}}
 <div class="movie-container">
-	<h3>{{upper-case-i18n "movies"}}</h3>
+	<h3>{{upper-case-i18n name}}</h3>
 	<ul class="list-undstyled">
 		{{#each}}
 		<li>
@@ -13,13 +13,13 @@
 	</ul>
 	<div class="movie-summary">
 		<h5>{{upper-case-i18n "movie.summary"}}</h5>
-		<div class="movie-watches">{{t "movie.max.watches"}} <span>{{maxWatches}} {{t "viewers"}}</span></div>
-		<div class="movie-watches">{{t "movie.min.watches"}}<span>{{minWatches}} {{t "viewers"}}</span></div>
+		<div class="movie-watches">{{t "movie.maxWatches"}} <span>{{maxWatches}} {{t "movie.viewers"}}</span></div>
+		<div class="movie-watches">{{t "movie.minWatches"}}<span>{{minWatches}} {{t "movie.viewers"}}</span></div>
 		<div class="movie-watches">{{t "movie.award"}}
 			{{#if hasMovieAward}}
-			<span>{{t "yes"}}</span>
+			<span>{{t "movie.yes"}}</span>
 			{{else}}
-			<span>{{t "no.exclamation"}}</span>
+			<span>{{t "movie.noExclamation"}}</span>
 			{{/if}}
 		</div>				
 		<div class="movie-watches">
diff --git a/MarvelWorld-Cli/blueprints/.jshintrc b/MarvelWorld-Cli/blueprints/.jshintrc
diff --git a/MarvelWorld-Cli/blueprints/ember-i18n/index.js b/MarvelWorld-Cli/blueprints/ember-i18n/index.js
diff --git a/MarvelWorld-Cli/bower.json b/MarvelWorld-Cli/bower.json
@@ -16,7 +16,6 @@
     "bootstrap": "~3.3.2",
     "moment": "~2.9.0",
     "bootstrap-datepicker": "~1.3.1",
-    "cldr": "~1.0.2",
-    "ember-i18n": "~2.9.1"
+    "cldr": "~1.0.2"
   }
 }
diff --git a/MarvelWorld-Cli/config/environment.js b/MarvelWorld-Cli/config/environment.js
@@ -14,6 +14,7 @@ module.exports = function(environment) {
     },
 
     APP: {
+        defaultLocale: 'es'
       // Here you can pass flags/options to your application instance
       // when it is created
     }
diff --git a/MarvelWorld-Cli/package.json b/MarvelWorld-Cli/package.json
@@ -34,6 +34,7 @@
     "ember-cli-qunit": "0.3.1",
     "ember-cli-table": "0.0.2",
     "ember-cli-uglify": "1.0.1",
+    "ember-cli-i18n": "0.0.2",
     "ember-data": "1.0.0-beta.12",
     "ember-export-application-global": "^1.0.0",   
     "ember-validations": "~ 2.0.0-alpha.2",
diff --git a/MarvelWorld-Cli/public/assets/images/spain-flag.png b/MarvelWorld-Cli/public/assets/images/spain-flag.png
diff --git a/MarvelWorld-Cli/tests/unit/initializers/i18n-test.js b/MarvelWorld-Cli/tests/unit/initializers/i18n-test.js
