diff --git a/app/models/story.rb b/app/models/story.rb index 164a5d844..7e41645b7 100644 --- a/app/models/story.rb +++ b/app/models/story.rb @@ -20,7 +20,7 @@ def source end def pretty_date - self.published.strftime("%A, %B %d") + I18n.l(self.published) end def as_json(options = {}) diff --git a/app/views/partials/_feed.erb b/app/views/partials/_feed.erb index dfa686045..deccff07a 100644 --- a/app/views/partials/_feed.erb +++ b/app/views/partials/_feed.erb @@ -10,9 +10,9 @@ <%= t('partials.feed.last_updated') %> <% if feed.last_fetched %> - <%= feed.last_fetched.strftime("%b %d, %H:%M") %> + <%= I18n.l(feed.last_fetched) %> <% else %> - Never + <%= t("partials.feed.last_fetched.never") %> <% end %> diff --git a/app/views/partials/_story.erb b/app/views/partials/_story.erb index 90b3ac433..19926f492 100644 --- a/app/views/partials/_story.erb +++ b/app/views/partials/_story.erb @@ -30,7 +30,7 @@
diff --git a/config/locales/de.yml b/config/locales/de.yml index 22cf7d509..a53ac5dd4 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -13,6 +13,8 @@ de: index: add_some_feeds: "Hey, du solltest ein paar Feeds %{add}." add: "hinzufügen" + stories: + keep_unread: "Als ungelesen behalten" first_run: password: title: 'Stringer ist' @@ -31,21 +33,27 @@ de: refresh: "Aktualisieren" view_feeds: "Zeige Feeds an" add_feed: "Füge einen Feed hinzu" + archived_stories: "Archivierte Geschichten" feed: last_updated: "Zuletzt aktualisiert um" status_bubble: green: "Erfolg!" - yellow: "Fehler beim analysieren der (wahrscheinlich temporäre)" - red: "Fehler beim analysieren (und es funktionierte nie vor, entweder)" + yellow: "Fehler beim Analysieren der (wahrscheinlich temporäre)" + red: "Fehler beim Analysieren (und es funktionierte nie vor, entweder)" + last_fetched: + never: "Nie" feed_action_bar: home: "Zurück zu den Geschichten" feeds: "Zeige Feeds an" add_feed: "Füge einen Feed hinzu" + archived_stories: "Archivierte Geschichten" shortcuts: title: "Tastaturkürzel" keys: jk: "Nächste/vorherige Geschichte" + np: "Hoch/runter bewegen" oenter: "Klappe Geschichte aus/ein" + m: "Markiere Geschichte als gelesen/ungelesen" or: "oder" v: "Öffne die URL der Geschichte" shifta: "Alle als gelesen markieren" @@ -54,6 +62,7 @@ de: zero: "Du hast RSS Zero™ erreicht" gtfo: 'Jetzt hör auf Blogs zu lesen und' go_make: 'geh und mach etwas' + archive: "alle Einträge anzeigen" sessions: new: title: 'Stringer sagt' @@ -96,3 +105,26 @@ de: description: "Wir besorgen dir Geschichten zum Lesen, gib uns eine Sekunde." start: "Fang an zu lesen" ready: "Okay, es ist bereit!" + archive: + next: "Nächste" + previous: "Vorherige" + of: "von" + sorry: "Entschuldigung, du hast noch keine Geschichten gelesen." + time: + formats: + default: "%e. %b, %H:%M Uhr" + date: + abbr_month_names: + - + - Jan + - Feb + - Mär + - Apr + - Mai + - Jun + - Jul + - Aug + - Sep + - Okt + - Nov + - Dez diff --git a/config/locales/en.yml b/config/locales/en.yml index 3ecc9a138..320b0e364 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -40,6 +40,8 @@ en: green: "Success!" yellow: "Error parsing (probably temporary)" red: "Error parsing (and it ain't never worked before, either)" + last_fetched: + never: "Never" feed_action_bar: home: "Return to Stories" feeds: "View feeds" @@ -108,3 +110,21 @@ en: previous: "Previous" of: "of" sorry: "Sorry, you haven't read any stories yet!" + time: + formats: + default: "%b %d, %H:%M" + date: + abbr_month_names: + - + - Jan + - Feb + - Mar + - Apr + - May + - Jun + - Jul + - Aug + - Sep + - Oct + - Nov + - Dec diff --git a/config/locales/es.yml b/config/locales/es.yml index b04991151..54083d5a7 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -92,3 +92,21 @@ es: next: "Next" previous: "Previous" sorry: "Sorry, you haven't read any stories yet!" + time: + formats: + default: "%d de %b %H:%M" + date: + abbr_month_names: + - + - ene + - feb + - mar + - abr + - may + - jun + - jul + - ago + - sep + - oct + - nov + - dic diff --git a/config/locales/fr.yml b/config/locales/fr.yml index af591ae78..70cb82d9c 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -104,3 +104,22 @@ fr: previous: "Précédent" of: "de" sorry: "Désolé, vous n'avez encore lu aucun article !" + time: + formats: + default: "%d %b %H:%M" + date: + abbr_month_names: + - + - jan. + - fév. + - mar. + - avr. + - mai + - juin + - juil. + - août + - sept. + - oct. + - nov. + - déc. + diff --git a/config/locales/gr.yml b/config/locales/gr.yml index e0b4e6460..e1cb7cbae 100644 --- a/config/locales/gr.yml +++ b/config/locales/gr.yml @@ -104,3 +104,22 @@ gr: previous: "Προηγούμενο" of: "απο" sorry: "Λυπάμαι, δεν διάβασε καμία είδηση ακόμη." + time: + formats: + default: "%d %b %H:%M" + date: + abbr_month_names: + - + - Ιαν + - Φεβ + - Μαρ + - Απρ + - Μαϊ + - Ιουν + - Ιουλ + - Αυγ + - Σεπ + - Οκτ + - Νοε + - Δεκ + diff --git a/config/locales/it.yml b/config/locales/it.yml index a6f3a8477..f2ff05e07 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -85,4 +85,23 @@ it: description: "Stiamo importando alcune storie da leggere, dacci un secondo." start: "Inizia a leggere" ready: "Okay, è pronto!" + time: + formats: + default: "%d %b, %H:%M" + date: + abbr_month_names: + - + - gen + - feb + - mar + - apr + - mag + - giu + - lug + - ago + - set + - ott + - nov + - dic + diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 9f431a68c..a839f1fee 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -99,8 +99,26 @@ nl: description: "We zijn je artikelen aan het ophalen, geef ons even." start: "Je kunt beginnen met lezen" ready: "Okay, klaar!" -archive: + archive: next: "Volgende" previous: "Vorige" of: "van" sorry: "Sorry, je hebt nog geen artikelen gelezen!" + time: + formats: + default: "%d %b, %H:%M" + date: + abbr_month_names: + - + - jan + - feb + - mar + - apr + - mei + - jun + - jul + - aug + - sep + - okt + - nov + - dec diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index fc8337faa..7611bab07 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -104,3 +104,21 @@ previous: "Anterior" of: "de" sorry: "Desculpe, você não leu alguma história ainda!" + time: + formats: + default: "%d de %b, %H:%M" + date: + abbr_month_names: + - + - Jan + - Fev + - Mar + - Abr + - Mai + - Jun + - Jul + - Ago + - Set + - Out + - Nov + - Dez diff --git a/config/locales/sv.yml b/config/locales/sv.yml index 89501fec7..b89bd9f4b 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -104,3 +104,21 @@ sv: previous: "Föregående" of: "av" sorry: "Tyvärr, du har inte läst några berättelser än!" + time: + formats: + default: "%e %berättelser %H:%M" + date: + abbr_month_names: + - + - jan + - feb + - mar + - apr + - maj + - jun + - jul + - aug + - sep + - okt + - nov + - dec diff --git a/config/locales/zh_CN.yml b/config/locales/zh_CN.yml index a4dac2cdc..4ae856304 100644 --- a/config/locales/zh_CN.yml +++ b/config/locales/zh_CN.yml @@ -106,3 +106,22 @@ zh_CN: previous: "上一页" of: "of" sorry: "呃,你现在还没有已经读过的故事" + time: + formats: + default: "%b%d日 %H:%M" + date: + abbr_month_names: + - + - 一月 + - 二月 + - 三月 + - 四月 + - 五月 + - 六月 + - 七月 + - 八月 + - 九月 + - 十月 + - 十一月 + - 十二月 +