Skip to content

Commit 80c95aa

Browse files
chandermanichandermani
committed
Completely got rid of angular-translate (angular 1). Now using ng2-translate
1 parent b68662f commit 80c95aa

19 files changed

Lines changed: 69 additions & 84 deletions

‎trainer/app/i18n/de.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
"HEADER":"Bereit f�r ein Workout?",
1010
"SELECT":"W�hlen Workout",
1111
"WORKOUTS":"Workouts",
12-
"SEARCH":"Suchen Sie nach dem Training"
12+
"SEARCH":"Suchen Sie nach dem Training",
13+
"CREATE":"Erstellen Sie ein Workout"
1314
},
1415
"RUNNER" : {
1516
"DESC":"Beschreibung",

‎trainer/app/i18n/de/workoutbuilder.json‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎trainer/app/i18n/de/workoutrunner.json‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎trainer/app/i18n/en.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
"HEADER":"Ready for a Workout?",
1010
"SELECT":"Select Workout",
1111
"WORKOUTS":"Workouts",
12-
"SEARCH":"Search for workout"
12+
"SEARCH":"Search for workout",
13+
"CREATE":"Create a Workout"
1314
},
1415
"RUNNER" : {
1516
"DESC":"Description",

‎trainer/app/i18n/en/workoutbuilder.json‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎trainer/app/i18n/en/workoutrunner.json‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎trainer/app/index.html‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
<div class="navbar-brand">Personal Trainer</div>
2222
</div>
2323
<ul class="nav navbar-nav navbar-right">
24-
<li><a ng-click="setLanguage('en')" title="{{'TOPNAV.ENGLISH'|translate}}" ng-class="{'btn-primary':language==='en'}"><img src="img/flag-usa.gif" alt="English"/></a></li>
25-
<li><a ng-click="setLanguage('de')" title="{{'TOPNAV.GERMAN'|translate}}" ng-class="{'btn-primary':language==='de'}"><img src="img/flag-germany.gif" alt="German"/></a></li>
26-
<li><a ng-click="showWorkoutHistory()" title="{{'TOPNAV.HISTORYTITLE'|translate}}">{{'TOPNAV.HISTORY'|translate}}</a></li>
24+
<li><a ng-click="setLanguage('en')" title="{{'TOPNAV.ENGLISH'|ng2Translate}}" ng-class="{'btn-primary':language==='en'}"><img src="img/flag-usa.gif" alt="English"/></a></li>
25+
<li><a ng-click="setLanguage('de')" title="{{'TOPNAV.GERMAN'|ng2Translate}}" ng-class="{'btn-primary':language==='de'}"><img src="img/flag-germany.gif" alt="German"/></a></li>
26+
<li><a ng-click="showWorkoutHistory()" title="{{'TOPNAV.HISTORYTITLE'|ng2Translate}}">{{'TOPNAV.HISTORY'|ng2Translate}}</a></li>
2727
</ul>
2828
</div>
2929
<div id="top-nav-container" class="second-top-nav">
@@ -52,8 +52,6 @@
5252
<script src="node_modules/angular-messages/angular-messages.js"></script>
5353
<!--Script required for E2E testing. Comment it in production use-->
5454
<!--<script src="node_modules/angular-mocks/angular-mocks.js"></script>-->
55-
<script src="node_modules/angular-translate/dist/angular-translate.js"></script>
56-
<script src="node_modules/angular-translate-loader-partial/angular-translate-loader-partial.js"></script>
5755
<script src="node_modules/angular-ui-bootstrap/dist/ui-bootstrap-tpls.js"></script>
5856
<script src="//cdnjs.cloudflare.com/ajax/libs/owl-carousel/1.3.2/owl.carousel.js"></script>
5957
<script src="js/vendor/angular-media-player.js"></script>

‎trainer/app/js/app.js‎

Lines changed: 4 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎trainer/app/js/app.module.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎trainer/app/js/app.module.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
angular.module('app', ['ngRoute', 'ngSanitize', '7minWorkout', 'WorkoutBuilder', 'mediaPlayer', 'ui.bootstrap', 'LocalStorageModule', 'ngAnimate', 'ngResource', 'ngMessages', 'pascalprecht.translate', 'start', 'finish']);
1+
angular.module('app', ['ngRoute', 'ngSanitize', '7minWorkout', 'WorkoutBuilder', 'mediaPlayer', 'ui.bootstrap', 'LocalStorageModule', 'ngAnimate', 'ngResource', 'ngMessages', 'start', 'finish']);
22

33
angular.module('7minWorkout', []);
44
angular.module('WorkoutBuilder', []);

0 commit comments

Comments
 (0)