Updated for i18n and added mixins,

Author: kilisoria

MarvelWorld-Cli/app/controllers/comics.js

@@ -1,5 +1,6 @@
 import Ember from 'ember';
+import BaseController from '../mixins/base-controller';
 
-export default Ember.ArrayController.extend({
+export default Ember.ArrayController.extend(BaseController,{
 
 });

MarvelWorld-Cli/app/controllers/events.js

@@ -1,6 +1,7 @@
 import Ember from 'ember';
+import BaseController from '../mixins/base-controller';
 
-export default Ember.ArrayController.extend({
+export default Ember.ArrayController.extend(BaseController,{
     sortProperties: ['country'],
     sortAscending: false,
 	actions:{

MarvelWorld-Cli/app/controllers/games/index.js

@@ -1,5 +1,6 @@
 import Ember from 'ember';
+import BaseController from '../../mixins/base-controller';
 
-export default Ember.ArrayController.extend({
+export default Ember.ArrayController.extend(BaseController,{
 needs:['games/index']	
 });

MarvelWorld-Cli/app/controllers/movies/index.js

@@ -1,6 +1,7 @@
 import Ember from 'ember';
+import BaseController from '../../mixins/base-controller';
 
-export default Ember.ArrayController.extend({
+export default Ember.ArrayController.extend(BaseController,{
 	sortProperties: ['title'],
     sortAscending: true,
 	watches: Ember.computed.mapBy('model', 'watches'),

MarvelWorld-Cli/app/controllers/movies/view.js

@@ -15,20 +15,22 @@ export default Ember.Controller.extend({
 	actorNames: Ember.computed.map('model.actors', function(actor){
 		return actor.get('name').split(' ')[0] + ' ';
 	}),
-	hasGoodRating: Ember.computed.gt('model.review', 9),	
+	/*	hasGoodRating: Ember.computed.gt('model.review', 9),	*/
+	hasGoodRating: function(){
+		var rate = this.get('container').lookup('application:main').get('awardRate');
+		return  this.get('model.review') >= rate;
+	}.property('model.review'),
 	checkReviewChanged: function(e){
-	if(e.target.router.activeTransition === null){
-	console.log('Observers');			
-	var amount = this.get('reviewCountChanged');
-	console.log(amount);			
-	amount++;
-	this.set('reviewCountChanged', amount);		
-		if(amount === 3){
-			alert('OBSERVERS - Wait! Do you have any doubts about the movie? then... watch it again! :)');
+		if(e.target.router.activeTransition === null){		
+			var amount = this.get('reviewCountChanged');	
+			amount++;
+			this.set('reviewCountChanged', amount);		
+			if(amount === 3){
+				alert(this.get('i18n').current.reviewChangedValidation);
+				this.set('reviewCountChanged', 0);
+			}
+		}else{
 			this.set('reviewCountChanged', 0);
 		}
-	}else{
-			this.set('reviewCountChanged', 0);
-	}
-}.observes('model.review')	
+	}.observes('model.review')	
 });

MarvelWorld-Cli/app/helpers/upper-case-i18n.js

@@ -1,6 +1,6 @@
 import Ember from 'ember';
 
 
-export default Ember.Handlebars.makeBoundHelper(function(key){
-	
+export default Ember.Handlebars.makeBoundHelper(function(container, key){
+	return this.get('i18n').current[container][key];
 });

MarvelWorld-Cli/app/initializers/i18n.js

@@ -0,0 +1,35 @@
+import Ember from 'ember';
+import enUs from '../locales/en';
+import esEs from '../locales/es';
+
+var i18n = {};
+
+var locales = {
+  'en': enUs,
+  'es': esEs
+};
+
+function setCurrent(application) {
+  Ember.set(i18n, 'current', locales[application.defaultLocale]);  
+}
+
+export function initialize(container, application) {
+  application.register('utils:i18n', i18n, { instantiate: false });
+  application.inject('route', 'i18n', 'utils:i18n');
+  application.inject('model', 'i18n', 'utils:i18n');
+  application.inject('component', 'i18n', 'utils:i18n');
+  application.inject('controller', 'i18n', 'utils:i18n');
+
+  setCurrent(application);
+
+/*  application.localeStream.subscribe(function(stream) {
+    setCurrent(stream.value());
+  });*/
+}
+
+export default {
+  name: 'i18n-current',
+  after: 't',
+  initialize: initialize
+};
+

MarvelWorld-Cli/app/locales/en.js

@@ -1,12 +1,21 @@
 export default {
 	movie:{
+		name: "Movies",
 		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?",   		
+   		award: "(*) Is there movie with awards?",  
+   		allActors: "All actors",
+   		summary: "Summary" 		
 	},
 	english: "English",
-	spain: "Spain"
+	spain: "Spain",
+	premiere: "premiere",
+	comingSoon: "coming Soon",
+	released: "released",
+	reviewChangedValidation: "OBSERVERS - Wait! Do you have any doubts about the movie? then... watch it again! :)",
+	total: "Total"
 };
+

MarvelWorld-Cli/app/locales/es.js

@@ -1,11 +1,20 @@
 export default {
 	movie:{
-		name: "Movie",
+		name: "Peliculas",
 		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?",
-	}
+		minWatches: "(*) La película con menos cantidad de espectadores: ",
+		viewers: "espectadores.",
+		award: "(*) Hay peliculas con premiados?",
+		allActors: "Todos los actores",
+		summary: "Resumen"	
+	},
+	english: "Ingles",
+	spain: "Castellano",
+	premiere: "estreno",
+	comingSoon: "proximamente",
+	released: "estrenada",
+	reviewChangedValidation: "OBSERVERS - Momento..pareciera que tienes dudas con la clasificación de la peli..mirala de nuevo! :)",
+	total: "Total"
 };

MarvelWorld-Cli/app/mixins/base-controller.js

@@ -0,0 +1,6 @@
+
+export default Ember.Mixin.create({
+	total:function(){
+		return this.get('model').content.length;
+	}.property('model')
+});