Unverified Commit ae90036c authored by liuzheng712's avatar liuzheng712

Merge branch 'dev' into test

parents 65f1bb37 7fa4d6b3
...@@ -233,9 +233,9 @@ def replay(): ...@@ -233,9 +233,9 @@ def replay():
return redirect("http://jps.ilz.me/media/2017-12-24/ec87a486-0344-4f12-b27a-620321944f7f.gz") return redirect("http://jps.ilz.me/media/2017-12-24/ec87a486-0344-4f12-b27a-620321944f7f.gz")
@app.route('/i18n/<i18n>') @app.route('/luna/i18n/<i18n>')
def i18n(i18n): def i18n(i18n):
return send_file('./i18n/' + i18n + '.json') return send_file('./i18n/' + i18n)
def read_file(filename, charset='utf-8'): def read_file(filename, charset='utf-8'):
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
"target": "http://127.0.0.1:5000", "target": "http://127.0.0.1:5000",
"secure": false "secure": false
}, },
"/i18n": { "/luna/i18n": {
"target": "http://127.0.0.1:5000", "target": "http://127.0.0.1:5000",
"secure": false "secure": false
}, },
......
...@@ -198,7 +198,7 @@ export class AppService implements OnInit { ...@@ -198,7 +198,7 @@ export class AppService implements OnInit {
} }
if (this.lang !== 'en') { if (this.lang !== 'en') {
this._http.get('/i18n/' + this.lang).subscribe( this._http.get('/luna/i18n/' + this.lang + '.json').subscribe(
data => { data => {
this._localStorage.set('lang', JSON.stringify(data)); this._localStorage.set('lang', JSON.stringify(data));
} }
......
...@@ -280,7 +280,7 @@ export class ElementNavComponent implements OnInit { ...@@ -280,7 +280,7 @@ export class ElementNavComponent implements OnInit {
} }
Language(lan: string) { Language(lan: string) {
this._http.get('/i18n/' + lan).subscribe( this._http.get('/luna/i18n/' + lan + '.json').subscribe(
data => { data => {
this._localStorage.set('lang', JSON.stringify(data)); this._localStorage.set('lang', JSON.stringify(data));
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment