Merge pull request #11 from GeNiuS69/master

add using locale
b3by · Dec 22, 2016 · 8756451 · 8756451
2 parents 65ad7c0 + 4094422
commit 8756451
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/lib/atom-clock-view.js b/lib/atom-clock-view.js
@@ -29,6 +29,10 @@ export default class AtomClockView {
       this.refreshTicker()
     }))
 
+    this.subscriptions.add(atom.config.onDidChange('atom-clock.locale', () => {
+      this.refreshTicker()
+    }))
+
     this.subscriptions.add(atom.config.onDidChange('atom-clock.refreshInterval', () => {
       this.refreshTicker()
     }))
@@ -53,6 +57,7 @@ export default class AtomClockView {
 
   setConfigValues() {
     this.dateFormat = atom.config.get('atom-clock.dateFormat')
+    this.locale = atom.config.get('atom-clock.locale')
     this.refreshInterval = atom.config.get('atom-clock.refreshInterval') * 1000
     this.showIcon = atom.config.get('atom-clock.showClockIcon')
   }
@@ -75,7 +80,7 @@ export default class AtomClockView {
   }
 
   setDate() {
-    this.date = Moment().format(this.dateFormat)
+    this.date = Moment().locale(this.locale).format(this.dateFormat)
     this.element.firstChild.textContent = this.date
   }
 

diff --git a/lib/atom-clock.js b/lib/atom-clock.js
@@ -10,6 +10,11 @@ export default {
       title: 'Time format',
       description: 'Specify the time format. Please take a look at http://momentjs.com/docs/#/displaying/format/ to check all the available formats.',
       default: 'H:mm'
+    }, locale: {
+      type: 'string',
+      title: 'Locale',
+      description: 'Specify the time locale.',
+      default: 'en'
     }, refreshInterval: {
       type: 'integer',
       title: 'Clock interval',

diff --git a/spec/atom-clock-spec.js b/spec/atom-clock-spec.js
@@ -25,6 +25,7 @@ describe('Atom Clock', () => {
     expect(AtomClock.atomClockView.element).toBeDefined()
 
     expect(AtomClock.config.dateFormat.default).toBe('H:mm')
+    expect(AtomClock.config.locale.default).toBe('en')
     expect(AtomClock.config.refreshInterval.default).toBe(60)
     expect(AtomClock.config.showClockIcon.default).toBe(false)
   })