Skip to content

Commit f77ae6b

Browse files
committed
feat : ES5 - stepway - languges - add japaneese
1 parent 60d4c76 commit f77ae6b

16 files changed

+1180
-49
lines changed

README.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,13 @@ ______
273273
274274
## What is new?
275275
276+
- October 2015 : `Easy form Generator step way` : new languages added
277+
- french
278+
- german
279+
- japaneese
280+
[]()
281+
282+
276283
- October 2015 : `Easy form Generator step way` : enable or disable control in your easy form generator step way version.
277284
278285
```javascript
@@ -306,7 +313,6 @@ ______
306313
// 'GroupedSelect'
307314
```
308315
309-
310316
- Sept 2015 : `drag and drop way` is now a simple directive `eda-dragdrop-way-easy-form-gen`
311317
312318
- `Easy form Generator - Step way : new provider` : enable/disable modal animation from your own config thanks to new provider `easyFormSteWayConfigProvider`

dist/index_StepWay.html

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -732,6 +732,9 @@ <h6 class="text-right">Easy form generator : {{easyFormGeneratorVERSION}} — Er
732732
<script src='./public/lib/js/textAngular-sanitize.min.js'></script>
733733
<script src='./public/lib/js/textAngular.min.js'></script>
734734

735+
<!--angular-translate -->
736+
<script type="text/javascript" src='./public/lib/js/angular-translate.min.js'></script>
737+
735738
<!-- lodash -->
736739
<script src='./public/lib/js/lodash.min.js'></script>
737740

dist/index_StepWay_As_Module.html

Lines changed: 46 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,18 +47,40 @@
4747
<span class="icon-bar"></span>
4848
</button>
4949
</div>
50+
5051
<div class="navbar-collapse collapse" id="navbar-main">
5152
<ul class="nav navbar-nav">
5253
</ul>
54+
55+
<ul class="nav navbar-nav navbar-left">
56+
57+
<li class="dropdown">
58+
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">
59+
Switch language
60+
<span class="caret"></span></a>
61+
<ul class="dropdown-menu" role="menu">
62+
<li><a href="#" ng-click="demoCtrl.switchLanguage('en')">English</a></li>
63+
<li><a href="#" ng-click="demoCtrl.switchLanguage('fr')">French</a></li>
64+
<li><a href="#" ng-click="demoCtrl.switchLanguage('de')">German</a></li>
65+
<li><a href="#" ng-click="demoCtrl.switchLanguage('jp')">japanese</a></li>
66+
</ul>
67+
</li>
68+
69+
</ul>
70+
5371
<ul class="nav navbar-nav navbar-right">
5472
<li><a class="socialIcon" target="_blank" href="https://github.com/MacKentoch"><span class="text-center"><i class="fa fa-github"></i></span></a></li>
5573
<li><a class="socialIcon" target="_blank" href="https://twitter.com/erwan_datin"><span class="text-center"><i class="fa fa-twitter"></i></span></a></li>
5674
</ul>
5775
</div>
76+
77+
5878
</div>
5979
</div>
6080
</header>
6181

82+
83+
6284
<!-- Easy Form Generator (here step way) is now a ridiculous small html :
6385
=============================================================-->
6486
<eda-step-way-easy-form-gen
@@ -84,22 +106,36 @@
84106
])
85107
.controller('demoController', demoController);
86108

87-
demoController.$inject = ['$timeout'];
88-
function demoController($timeout){
109+
demoController.$inject = ['$timeout', 'easyFormSteWayConfig'];
110+
function demoController($timeout, easyFormSteWayConfig){
89111
var demoCtrl = this;
90112

91113
demoCtrl.easyFormGeneratorModel = {};
92114
demoCtrl.saveForm = saveForm;
115+
demoCtrl.currentLangue = refreshCurrentLanguage();
116+
demoCtrl.switchLanguage = switchLanguage;
93117

118+
94119

95120

96121
//demo purpose only :
97122
//in 3 seconds a new form will be bound to easy form generator :
98123
timedModelChanged();
99124

125+
console.info('Current language is ' + demoCtrl.currentLangue);
126+
127+
function switchLanguage(toLanguage){
128+
if(angular.isString){
129+
easyFormSteWayConfig.setLanguage(toLanguage);
130+
refreshCurrentLanguage();
131+
132+
console.info('language changed to ' + demoCtrl.currentLangue);
133+
}
134+
}
100135

101-
102-
136+
function refreshCurrentLanguage(){
137+
demoCtrl.currentLangue = easyFormSteWayConfig.getCurrentLanguage();
138+
}
103139

104140
/**
105141
* when click on save form, will call your save form function :
@@ -396,11 +432,13 @@
396432
<!-- angular app all concatenated here (app, controllers directives, containers ...) -->
397433
<script type="text/javascript" src="./public/js/eda.stepway.js"></script>
398434
<!-- textAngular Includes -->
399-
<script src='./public/lib/js/textAngular-rangy.min.js'></script>
400-
<script src='./public/lib/js/textAngular-sanitize.min.js'></script>
401-
<script src='./public/lib/js/textAngular.min.js'></script>
435+
<script type="text/javascript" src='./public/lib/js/textAngular-rangy.min.js'></script>
436+
<script type="text/javascript" src='./public/lib/js/textAngular-sanitize.min.js'></script>
437+
<script type="text/javascript" src='./public/lib/js/textAngular.min.js'></script>
402438
<!-- lodash -->
403-
<script src='./public/lib/js/lodash.min.js'></script>
439+
<script type="text/javascript" src='./public/lib/js/lodash.min.js'></script>
440+
<!--angular-translate -->
441+
<script type="text/javascript" src='./public/lib/js/angular-translate.min.js'></script>
404442
<!-- angular animate -->
405443
<script type="text/javascript" src="./public/lib/js/angular-animate.min.js"></script>
406444
<!-- angular toaster -->

dist/js/eda.stepway.js

Lines changed: 424 additions & 12 deletions
Large diffs are not rendered by default.

dist/js/eda.stepway.min.js

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

dist/public/js/eda.stepway.js

Lines changed: 424 additions & 12 deletions
Large diffs are not rendered by default.

dist/public/js/eda.stepway.min.js

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

dist/public/js/eda.stepway.min.js.map

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

dist/public/lib/js/angular-translate.min.js

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

index_StepWay_As_Module.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,7 @@
6262
<li><a href="#" ng-click="demoCtrl.switchLanguage('en')">English</a></li>
6363
<li><a href="#" ng-click="demoCtrl.switchLanguage('fr')">French</a></li>
6464
<li><a href="#" ng-click="demoCtrl.switchLanguage('de')">German</a></li>
65-
<!--<li><a href="#" ng-click="demoCtrl.switchLanguage('sp')">Spannish</a></li>-->
66-
<!--<li><a href="#" ng-click="demoCtrl.switchLanguage('jp')">japanese</a></li>-->
65+
<li><a href="#" ng-click="demoCtrl.switchLanguage('jp')">japanese</a></li>
6766
</ul>
6867
</li>
6968

0 commit comments

Comments
 (0)