Skip to content
  • Projects
  • Groups
  • Snippets
  • Help

Codecrew / Moya

  • This project
    • Loading...
  • Sign in
Go to a project
  • Project
  • Repository
  • Issues 30
  • Merge Requests 2
  • Wiki
  • Snippets
  • Settings
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Commits
  • Issue Boards
Merged
Merge Request !395 opened Mar 31, 2018 by Tuukka Kivilahti@tkfftk

Feature/i18n for angular

Support For I18N for moya-angular

Edited Apr 01, 2018
Request to merge feature/i18n-for-angular into master
Pipeline #39 passed
for 396250da.
Pipeline #39 passed with warnings
for 396250da.
Pipeline #39 skipped
for 396250da.
Pipeline #39 waiting for manual action
for 396250da.
Pipeline #39 canceled
for 396250da.
Pipeline #39 failed
for 396250da.
Pipeline #39 running
for 396250da.
Pipeline #39 pending
for 396250da.

Merged

  • The changes were merged into master.
  • The source branch has been removed.
  • Discussion 19
  • Commits 12
  • Pipelines 6
  • Changes 64
  • {{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Tuukka Kivilahti @tkfftk

    added 1 commit

    • 73882464 - docs

    Compare with previous version

    Mar 31, 2018

    added 1 commit

    • 73882464 - docs

    Compare with previous version

    Toggle commit list
  • 6df7c7fb78c180b4066222cf874b2c0a?s=80&d=identicon
    Antti Väyrynen
    @xeii started a discussion on an outdated diff Apr 01, 2018
    Resolved by Antti Väyrynen Apr 01, 2018
    code/moya-angular/src/app/app.component.ts
    12 14 })
    13 15 export class AppComponent {
    14 16
    15 constructor(private router: Router, private zone: NgZone) {
    17 constructor(private router: Router, private zone: NgZone, private translate: TranslateService) {
    • Antti Väyrynen @xeii commented Apr 01, 2018
      Master

      TranslateService is unused here, remove.

  • 6df7c7fb78c180b4066222cf874b2c0a?s=80&d=identicon
    Antti Väyrynen
    @xeii started a discussion on the diff Apr 01, 2018
    Resolved by Antti Väyrynen Apr 01, 2018
    code/moya-angular/src/app/components/moya-locale/moya-locale.component.ts 0 → 100644
    22
    23 constructor(private localeService : MoyaLocaleService, private translate : TranslateService) {
    24 // fallback language
    25 translate.setDefaultLang(DEFAULT_LOCALE);
    26 this.selectLocale(DEFAULT_LOCALE);
    27 }
    28
    29 ngOnInit() {
    30 this.localeService.getUserLocale().subscribe(locale => { this.selectLocale(locale)} );
    31 }
    32
    33
    34 selectLocale(locale : string, save :boolean = false):void {
    35
    36 if(![ENGLISH, FINNISH, SWEDISH].includes(locale)) {
    37 return;
    • Antti Väyrynen @xeii commented Apr 01, 2018
      Master

      throw here? Or at least console.warn

  • Jenkins @jenkins commented Apr 01, 2018
    Developer

    Build triggered.

  • Jenkins @jenkins commented Apr 01, 2018
    Developer

    Build Started: https://jenkins.codecrew.fi/job/Moya/job/moya-master/157/

  • Jenkins @jenkins commented Apr 01, 2018
    Developer

    Build finished. Tests PASSED. Build results available at: https://jenkins.codecrew.fi/job/Moya/job/moya-master/157/

  • Tuukka Kivilahti @tkfftk

    added 7 commits

    • 73882464...b1f00ba6 - 5 commits from branch master
    • 9a876f0a - Merge remote-tracking branch 'origin/master' into feature/i18n-for-angular
    • 0d127765 - fixed xeii's comments

    Compare with previous version

    Apr 01, 2018

    added 7 commits

    • 73882464...b1f00ba6 - 5 commits from branch master
    • 9a876f0a - Merge remote-tracking branch 'origin/master' into feature/i18n-for-angular
    • 0d127765 - fixed xeii's comments

    Compare with previous version

    Toggle commit list
  • Jenkins @jenkins commented Apr 01, 2018
    Developer

    Build triggered.

  • Jenkins @jenkins commented Apr 01, 2018
    Developer

    Build Started: https://jenkins.codecrew.fi/job/Moya/job/moya-master/159/

  • Jenkins @jenkins commented Apr 01, 2018
    Developer

    Build finished. Tests PASSED. Build results available at: https://jenkins.codecrew.fi/job/Moya/job/moya-master/159/

  • Tuukka Kivilahti @tkfftk

    added 1 commit

    • cc6f71f5 - moved viplist to correct location

    Compare with previous version

    Apr 01, 2018

    added 1 commit

    • cc6f71f5 - moved viplist to correct location

    Compare with previous version

    Toggle commit list
  • Jenkins @jenkins commented Apr 01, 2018
    Developer

    Build triggered.

  • Jenkins @jenkins commented Apr 01, 2018
    Developer

    Build Started: https://jenkins.codecrew.fi/job/Moya/job/moya-master/160/

  • Jenkins @jenkins commented Apr 01, 2018
    Developer

    Build finished. Tests PASSED. Build results available at: https://jenkins.codecrew.fi/job/Moya/job/moya-master/160/

  • Tuukka Kivilahti @tkfftk

    added 1 commit

    • 0fee3c89 - changes from commits

    Compare with previous version

    Apr 01, 2018

    added 1 commit

    • 0fee3c89 - changes from commits

    Compare with previous version

    Toggle commit list
  • Tuukka Kivilahti @tkfftk

    added 1 commit

    • e24385dc - bug

    Compare with previous version

    Apr 01, 2018

    added 1 commit

    • e24385dc - bug

    Compare with previous version

    Toggle commit list
  • Jenkins @jenkins commented Apr 01, 2018
    Developer

    Build triggered.

  • Jenkins @jenkins commented Apr 01, 2018
    Developer

    Build Started: https://jenkins.codecrew.fi/job/Moya/job/moya-master/161/

  • Jenkins @jenkins commented Apr 01, 2018
    Developer

    Build finished. Tests PASSED. Build results available at: https://jenkins.codecrew.fi/job/Moya/job/moya-master/161/

  • Antti Väyrynen @xeii

    added 1 commit

    • 05a1b193 - cleaning

    Compare with previous version

    Apr 01, 2018

    added 1 commit

    • 05a1b193 - cleaning

    Compare with previous version

    Toggle commit list
  • Jenkins @jenkins commented Apr 01, 2018
    Developer

    Build triggered.

  • Jenkins @jenkins commented Apr 01, 2018
    Developer

    Build Started: https://jenkins.codecrew.fi/job/Moya/job/moya-master/162/

  • Jenkins @jenkins commented Apr 01, 2018
    Developer

    Build finished. Tests PASSED. Build results available at: https://jenkins.codecrew.fi/job/Moya/job/moya-master/162/

  • Antti Väyrynen @xeii

    resolved all discussions

    Apr 01, 2018

    resolved all discussions

    Toggle commit list
  • Tuukka Kivilahti @tkfftk

    added 2 commits

    • 3e5da1d0 - cleanup
    • 396250da - Merge branch 'feature/i18n-for-angular' of gitlab.codecrew.fi:codecrew/moya into…

    Compare with previous version

    Apr 01, 2018

    added 2 commits

    • 3e5da1d0 - cleanup
    • 396250da - Merge branch 'feature/i18n-for-angular' of gitlab.codecrew.fi:codecrew/moya into…

    Compare with previous version

    Toggle commit list
  • Jenkins @jenkins commented Apr 01, 2018
    Developer

    Build triggered.

  • Jenkins @jenkins commented Apr 01, 2018
    Developer

    Build Started: https://jenkins.codecrew.fi/job/Moya/job/moya-master/164/

  • Antti Väyrynen @xeii

    merged

    Apr 01, 2018

    merged

    Toggle commit list
  • Antti Väyrynen @xeii

    mentioned in commit 1cbc86e7

    Apr 01, 2018

    mentioned in commit 1cbc86e7

    Toggle commit list
  • Write
  • Preview
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
  • Please register or sign in to post a comment
Assignee
No assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
0
Labels
None
Assign labels
  • View labels
3
3 participants
Reference: codecrew/moya!395
×

Revert this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.
×

Cherry-pick this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.