diff --git a/app/models/feed.rb b/app/models/feed.rb index 95dc81126..dea625807 100644 --- a/app/models/feed.rb +++ b/app/models/feed.rb @@ -14,10 +14,7 @@ def status=(s) end def status_bubble - if status == :red - return :yellow unless stories.empty? - end - + return :yellow if status == :red && stories.any? status end end \ No newline at end of file diff --git a/app/views/feeds/index.erb b/app/views/feeds/index.erb index 1f180dc4e..443380544 100644 --- a/app/views/feeds/index.erb +++ b/app/views/feeds/index.erb @@ -15,3 +15,9 @@

<%= t('feeds.index.add_some_feeds', :add => ''+t('feeds.index.add')+'') %>

<% end %> + + \ No newline at end of file diff --git a/app/views/partials/_feed.erb b/app/views/partials/_feed.erb index 7e4d25a9a..f859bf04d 100644 --- a/app/views/partials/_feed.erb +++ b/app/views/partials/_feed.erb @@ -2,7 +2,7 @@

- + " data-placement="left"> <%= feed.name %>

diff --git a/config/locales/de.yml b/config/locales/de.yml index ecbf98c35..22cf7d509 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -33,6 +33,10 @@ de: add_feed: "Füge einen Feed hinzu" 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)" feed_action_bar: home: "Zurück zu den Geschichten" feeds: "Zeige Feeds an" diff --git a/config/locales/en.yml b/config/locales/en.yml index 0238203c6..aad8d88c7 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -34,6 +34,10 @@ en: archived_stories: "Archived stories" feed: last_updated: "Last updated at" + status_bubble: + green: "Success!" + yellow: "Error parsing (probably temporary)" + red: "Error parsing (and it ain't never worked before, either)" feed_action_bar: home: "Return to Stories" feeds: "View feeds" diff --git a/config/locales/es.yml b/config/locales/es.yml index 7b8d7bc56..b04991151 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -28,6 +28,10 @@ es: archived_stories: "Archived stories" feed: last_updated: "Última actualización" + status_bubble: + green: "¡ Un éxito!" + yellow: "Error de análisis (probablemente temporal)" + red: "Error de análisis (y nunca funcionó antes, tampoco)" feed_action_bar: home: "Volver a historias" feeds: "Ver feeds" diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 3fa53607c..605b11d5e 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -34,6 +34,10 @@ fr: archived_stories: "Articles archivés" feed: last_updated: "Dernière mise-à-jour à" + status_bubble: + green: "Succès !" + yellow: "Erreur d'analyse (probablement temporaire)" + red: "Erreur d'analyse (et il n'a jamais travaillé avant, non plus)" feed_action_bar: home: "Revenir aux Articles" feeds: "Voir les flux" diff --git a/config/locales/it.yml b/config/locales/it.yml index 74455bdb4..a6f3a8477 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -27,6 +27,10 @@ it: add_feed: "Aggiungi un feed" feed: last_updated: "Ultimo aggiornamento il" + status_bubble: + green: "Successo!" + yellow: "Errore di analisi (probabilmente temporanea)" + red: "Errore di analisi (e mai lavorato prima, neanche)" feed_action_bar: home: "Ritorna alle Storie" feeds: "Mostra i feed" diff --git a/config/locales/nl.yml b/config/locales/nl.yml index d35158568..a81a99fdb 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -33,6 +33,10 @@ nl: add_feed: "Feed toevoegen" feed: last_updated: "Laatst bijgewerkt op" + status_bubble: + green: "Succes!" + yellow: "Fout ontleden (waarschijnlijk tijdelijke)" + red: "Fout ontleden (en het nooit gewerkt voordat, ofwel)" feed_action_bar: home: "Terug naar artikelen" feeds: "Feeds bekijken" diff --git a/config/locales/pt.yml b/config/locales/pt.yml index f61656592..07611b3a8 100644 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -28,6 +28,10 @@ pt: archived_stories: "Archived stories" feed: last_updated: "Atualizado da última vez em" + status_bubble: + green: "Sucesso!" + yellow: "Erro de análise (provavelmente temporária)" + red: "Erro de análise (e ele nunca trabalhou antes, tampouco)" feed_action_bar: home: "Retornar para Histórias" feeds: "Ver feeds" diff --git a/config/locales/zh_CN.yml b/config/locales/zh_CN.yml index 8545aa3d7..389732fe2 100644 --- a/config/locales/zh_CN.yml +++ b/config/locales/zh_CN.yml @@ -33,6 +33,10 @@ zh_CN: add_feed: "添加新订阅" feed: last_updated: "最后更新于" + status_bubble: + green: "成功" + yellow: "解析 (可能是短暂的) 时出现错误" + red: "错误分析 (和它从未合作过,要么)" feed_action_bar: home: "返回未读故事列表" feeds: "查看订阅列表"