latest changes

kaikoehn · Sep 27, 2016 · 2a09c34 · 2a09c34
1 parent 2e6040a
commit 2a09c34
Show file tree

Hide file tree

Showing 11 changed files with 570 additions and 509 deletions.
diff --git a/app/locales/en/translations.js b/app/locales/en/translations.js
@@ -1,4 +1,7 @@
 export default {
+    "GameIsPaused" : "Game is paused",
+    "GameIsAboutToStart" : "Game is about to start",
+    "GameHasEnded" : "Game has ended",
     "accept": "Accept",
     "accepted": "Accepted",
     "avgTomatoPrice": "Average Tomato Price",
@@ -39,5 +42,10 @@ export default {
         "resourceOverview": "Resource Overview",
         "history": "Transaction history",
         "title": "Tomato trade"
-    }
+    },
+    "fine": "fine",
+    "fixedCost": "fixed cost",
+    "kgOfTomatoes": "kg of tomatoes",
+    "pricePerKg": "price per kg",
+    "retailPrice": "retail price"
 }
diff --git a/app/locales/nl/translations.js b/app/locales/nl/translations.js
@@ -1,4 +1,7 @@
 export default {
+    "GameIsPaused" : "[NL]Game is paused",
+    "GameIsAboutToStart" : "[NL]Game is about to start",
+    "GameHasEnded" : "[NL]Game has ended",
     "accept": "Accepteren",
     "accepted": "Aanvaard",
     "avgTomatoPrice": "Gemiddelde Tomaten Prijs",

diff --git a/app/mixins/game-config-parser.js b/app/mixins/game-config-parser.js
@@ -11,6 +11,7 @@ let fn = function(self, tag) {
 }
 
 export default Ember.Mixin.create({
+  i18n: Ember.inject.service(),
 
   gameConfigurationRO: Ember.computed("gameConfiguration", {
     get() {
@@ -84,6 +85,7 @@ export default Ember.Mixin.create({
         let tradeType = x.startsWith("w") ? "Weekly trade" : "Daily trade";
         let tradingFor = /\d+/.exec(x)[0];
         let currentWeek = +tradingFor + (x.startsWith("w") ? -1 : 0);
+
         let roundTitle = `#${round} Week: ${currentWeek}: ${tradeType} for Week ${tradingFor}`;
         let playerSettings = allPlayerIds.map( (x)=> { return this.getValueForUserAndRound(cleanLines, x, round); } );
         return { round, roundTitle, playerSettings, tradingFor, tradeType};

diff --git a/app/models/offer.js b/app/models/offer.js
@@ -46,7 +46,7 @@ export default Model.extend({
     return (this.get("receiver.id") === undefined) ? "External" : this.get('receiver.id');
   }),
 
-  idxOfOfferInGame: Ember.computed("game.offers.[]", function() {
+  idxOfOfferInGame: Ember.computed("", function() {
 
     let gameOffers = this.get("game.offers");
     if (gameOffers === undefined || gameOffers.map === undefined) { return ""; }

diff --git a/app/models/user.js b/app/models/user.js
@@ -9,6 +9,8 @@ import _ from 'lodash/lodash';
 
 
 export default Model.extend({
+  i18n: Ember.inject.service(),
+
   // normal attribtues
   name                  : attr('string'),
 
@@ -59,10 +61,11 @@ export default Model.extend({
 
   //Result Seller 1 - Bob
   descriptivePlayerIdInGame: Ember.computed("playerPosition", "name", function() {
-    let prefix = this.get("isSeller") ? "Seller " : "Buyer ";
+    var prefix = this.get("isSeller") ? "seller" : "buyer";
+    prefix = this.get('i18n').t(prefix);
     let pos = this.get("playerPosition");
     let postfix = this.get("name") ? ` - ${this.get("name")}` : '';
-    return `${prefix}${pos}${postfix}`;
+    return `${prefix} ${pos}${postfix}`;
   }),
 
 

diff --git a/app/templates/components/player-offer-display.hbs b/app/templates/components/player-offer-display.hbs
@@ -1,7 +1,7 @@
   <li class="list-group-item {{offer.state}}">
     Round: {{offer.roundNumber}} Offer: {{offer.idxOfOfferInGame}} [{{offer.state}}] 
     <b>{{offer.receiverName}}</b>  
-    {{moment-format offer.ts "HH:mm:ss"}} / {{moment-from-now offer.ts hideSuffix=true interval=1000}} 
+    {{moment-format offer.ts "HH:mm:ss"}}
     <br>
     <b>{{offer.senderName}}</b> --&gt;
     <span class="to-tomato"></span> {{digit-group-format offer.tomatoes}} 

diff --git a/app/templates/components/timer-jumbotron.hbs b/app/templates/components/timer-jumbotron.hbs
@@ -8,16 +8,16 @@
       <h4 class="text-center game-title">{{liquid-bind game.currentTitle}}</h4>
       <p>
         {{#if game.isPaused}}
-          <p>Game is paused</p>
+          <p>{{t "GameIsPaused"}}</p>
         {{else}}
           {{tom-clock timeStartTs=game.timeStartTs timeEndTs=game.timeEndTs}}
         {{/if}}
       </p>
     {{else}}
       {{#if game.gameIsAboutToStart}}
-        <h4 class="text-center game-title">Game is about to start</h4>
+        <h4 class="text-center game-title">{{t "GameIsAboutToStart"}}</h4>
       {{else}}
-        <h4 class="text-center game-title">Game has ended</h4>
+        <h4 class="text-center game-title">{{t "GameHasEnded"}}</h4>
       {{/if}}
     {{/if}}
   </div>

diff --git a/app/templates/games.hbs b/app/templates/games.hbs
@@ -61,13 +61,13 @@
                   <span class="title-container"><h5>Minutes Round: </h5></span> {{input disabled=1 type="number" value=game.minutesPerRound class="form-control" }}
                 </div>
                 <div class="form-group">
-                  <span class="title-container"><h5>{{t "seller"}} Fine: </h5></span> {{input disabled=1 type="number" value=game.fine class="form-control" }}
+                  <span class="title-container"><h5>{{capitalize (t 'fine')}}</h5></span> {{input disabled=1 type="number" value=game.fine class="form-control" }}
                 </div>
                 <div class="form-group">
-                  <span class="title-container"><h5>{{t "seller"}} FixedCost: </h5></span> {{input disabled=1 type="number" value=game.fixedCost class="form-control" }}
+                  <span class="title-container"><h5>{{capitalize (t 'fixedCost')}}</h5></span> {{input disabled=1 type="number" value=game.fixedCost class="form-control" }}
                 </div>
                 <div class="form-group">
-                  <span class="title-container"><h5>{{t "seller"}} RetailPrice: </h5></span> {{input disabled=1 type="number" value=game.retailPrice class="form-control" }}
+                  <span class="title-container"><h5>{{capitalize (t 'retailPrice')}}</h5></span> {{input disabled=1 type="number" value=game.retailPrice class="form-control" }}
                 </div>
               </span>
             {{/if}}

diff --git a/app/templates/player.hbs b/app/templates/player.hbs
@@ -176,7 +176,7 @@
                 <li class="list-group-item">
                   <strong>{{t "previousAcceptedOffers"}}</strong>
                 </li>
-                {{#each (filter-by "state" "accepted" (reverse obj.history))  as |offer|}}
+                {{#each (take 10 (filter-by "state" "accepted" (reverse obj.history)))  as |offer|}}
                   {{player-offer-display offer=offer}}
                 {{else}}
                   <li class="list-group-item"><i>{{t "na"}}</i></li>

diff --git a/config/environment.js b/config/environment.js
@@ -8,10 +8,10 @@ module.exports = function(environment) {
     locationType: 'auto',
 
     firebase: {
-      apiKey: "AIzaSyBxB2yDx0LIwExC-pKDlOlN-gxZK83MkYI",
-      authDomain: "tomato-37b32.firebaseapp.com",
-      databaseURL: "https://tomato-37b32.firebaseio.com",
-      storageBucket: "tomato-37b32.appspot.com",
+      apiKey: "AIzaSyB62IKGJyM3h6e29cLzNPovStBUH2JZmSc",
+      authDomain: "tomato2-f1fcb.firebaseapp.com",
+      databaseURL: "https://tomato2-f1fcb.firebaseio.com",
+      storageBucket: "",
     },
 
     EmberENV: {