Edgemaster & shaunmcdonald pointed out that my ad-hoc hackery was

covered by i18n translation framework. So use the magical :count
argument.

Also convert {{size}} to {{count}} in layouts.inbox

diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.rhtml
index ae16bbf99b2822fe23d2432eac8a4106d46964d1..105244611448fda29e2c6c5c8d6fd8ab9353be12 100644 (file)
--- a/app/views/layouts/site.rhtml
+++ b/app/views/layouts/site.rhtml
@@ -24,7 +24,12 @@
       <% if @user and @user.id %>
         <%= t 'layouts.welcome_user', :user_link => (link_to h(@user.display_name), {:controller => 'user', :action => 'view', :display_name => @user.display_name}, :title => t('layouts.welcome_user_link_tooltip')) %> | 
         <%= yield :greeting %>
       <% if @user and @user.id %>
         <%= t 'layouts.welcome_user', :user_link => (link_to h(@user.display_name), {:controller => 'user', :action => 'view', :display_name => @user.display_name}, :title => t('layouts.welcome_user_link_tooltip')) %> | 
         <%= yield :greeting %>

-        <%= link_to t('layouts.inbox', :size => @user.new_messages.size), {:controller => 'message', :action => 'inbox', :display_name => @user.display_name}, case @user.new_messages.size when 0 then { :title => t('layouts.inbox_tooltip_0') } when 1 then { :class => 'greeting-bar-unread', :title => t('layouts.inbox_tooltip_1') } else { :class => 'greeting-bar-unread', :title => t('layouts.inbox_tooltip_n', :size => @user.new_messages.size) } end %> |
+        <%
+        inbox_attributes = {}
+        inbox_attributes[:class] = 'greeting-bar-unread' if @user.new_messages.size > 0
+        inbox_attributes[:title] = t 'layouts.inbox_tooltip', :count => @user.new_messages.size
+        %>
+        <%= link_to t('layouts.inbox', :count => @user.new_messages.size), {:controller => 'message', :action => 'inbox', :display_name => @user.display_name}, inbox_attributes %> |

         <%= link_to t('layouts.logout'), {:controller => 'user', :action => 'logout', :referer => request.request_uri}, {:id => 'logoutanchor', :title => t('layouts.logout_tooltip')}%>
       <% else %>
         <%= link_to t('layouts.log_in'), {:controller => 'user', :action => 'login', :referer => request.request_uri}, {:id => 'loginanchor', :title => t('layouts.log_in_tooltip')} %>
         <%= link_to t('layouts.logout'), {:controller => 'user', :action => 'logout', :referer => request.request_uri}, {:id => 'logoutanchor', :title => t('layouts.logout_tooltip')}%>
       <% else %>
         <%= link_to t('layouts.log_in'), {:controller => 'user', :action => 'login', :referer => request.request_uri}, {:id => 'loginanchor', :title => t('layouts.log_in_tooltip')} %>

diff --git a/config/locales/be.yml b/config/locales/be.yml
index 731e81cc9c847a5bf67aa8fd54e869c6bd53a30c..174e7321742ed0a8aa2de141086b08a0bab5b73d 100644 (file)
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -296,7 +296,7 @@ be:
   layouts:
     welcome_user: "Вітаем, {{user_link}}"
     home: "дамоў"
   layouts:
     welcome_user: "Вітаем, {{user_link}}"
     home: "дамоў"

-    inbox: "уваходныя ({{size}})"
+    inbox: "уваходныя ({{count}})"

     logout: выйсці
     log_in: увайсці
     sign_up: зарэгістравацца
     logout: выйсці
     log_in: увайсці
     sign_up: зарэгістравацца

diff --git a/config/locales/de.yml b/config/locales/de.yml
index 764f40f092b1631465fdf2cf5556fb99bd6c10d7..9dd9f5827e8af1eff609eb987c1204732556bdef 100644 (file)
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -324,7 +324,7 @@ de:
   layouts:
     welcome_user: "Willkommen, {{user_link}}"
     home: "home"
   layouts:
     welcome_user: "Willkommen, {{user_link}}"
     home: "home"

-    inbox: "Posteingang ({{size}})"
+    inbox: "Posteingang ({{count}})"

     logout: Abmelden
     log_in: Anmelden
     sign_up: Registrieren
     logout: Abmelden
     log_in: Anmelden
     sign_up: Registrieren

diff --git a/config/locales/en.yml b/config/locales/en.yml
index b9dcea3ed119a62f4c67d8b5196530c5b80475ed..396fd28d6941f5d081861163f1d3e6e09298d95a 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -335,10 +335,11 @@ en:
     welcome_user_link_tooltip: Your user page
     home: home
     home_tooltip: Go to home location
     welcome_user_link_tooltip: Your user page
     home: home
     home_tooltip: Go to home location

-    inbox: "inbox ({{size}})"
-    inbox_tooltip_0: Your inbox contains no unread messages
-    inbox_tooltip_1: Your inbox contians 1 unread message
-    inbox_tooltip_n: Your inbox contains {{size}} unread messages
+    inbox: "inbox ({{count}})"
+    inbox_tooltip:
+      zero: Your inbox contains no unread messages
+      one: Your inbox contians 1 unread message
+      other: Your inbox contains {{count}} unread messages

     logout: logout
     logout_tooltip: "Log out"
     log_in: log in
     logout: logout
     logout_tooltip: "Log out"
     log_in: log in

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 50ffa7ac7e8a9f3519fab73d4ceb209cca268c1c..c4c734b46b84d9cbe2f85d8004ce9025af0a0f9e 100644 (file)
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -111,7 +111,7 @@ fr:
       comment_from: "Commentaire de {{link_user}} le {{comment_created_at}}"
   layouts:
     welcome_user: "Bienvenue, {{user_link}}"
       comment_from: "Commentaire de {{link_user}} le {{comment_created_at}}"
   layouts:
     welcome_user: "Bienvenue, {{user_link}}"

-    inbox: "Boite aux lettres ({{size}})"
+    inbox: "Boite aux lettres ({{count}})"

     logout: "Déconnexion"
     log_in: "Connexion"
     sign_up: "S'inscrire"
     logout: "Déconnexion"
     log_in: "Connexion"
     sign_up: "S'inscrire"

diff --git a/config/locales/he.yml b/config/locales/he.yml
index 9a89c04c5cb1de522fe807555e90f322c4101c6e..d8caf33cbabdccf36c9b47cfb06c312660536154 100644 (file)
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -297,7 +297,7 @@ he:
   layouts:
     welcome_user: "Welcome, {{user_link}}"
     home: "home"
   layouts:
     welcome_user: "Welcome, {{user_link}}"
     home: "home"

-    inbox: "inbox ({{size}})"
+    inbox: "inbox ({{count}})"

     logout: logout
     log_in: log in
     sign_up: sign up
     logout: logout
     log_in: log in
     sign_up: sign up

diff --git a/config/locales/is.yml b/config/locales/is.yml
index 710437fe8f9169576179946b6f90950f15bfec14..810b9611f4563a062ca2dc24316b189849fc7144 100644 (file)
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -323,7 +323,7 @@ is:
   layouts:
     welcome_user: "Hæ {{user_link}}"
     home: "heim"
   layouts:
     welcome_user: "Hæ {{user_link}}"
     home: "heim"

-    inbox: "innhólf ({{size}})"
+    inbox: "innhólf ({{count}})"

     logout: "útskrá"
     log_in: "innskrá"
     sign_up: "búa til aðgang"
     logout: "útskrá"
     log_in: "innskrá"
     sign_up: "búa til aðgang"

diff --git a/config/locales/it.yml b/config/locales/it.yml
index b2b227668d8140a1ebd51ca968d9b98c2f0dcdf7..26515477359d17f04896e31ff05fc18f3ce1e474 100644 (file)
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -297,7 +297,7 @@ it:
   layouts:
     welcome_user: "Benvenuto, {{user_link}}"
     home: "posizione iniziale"
   layouts:
     welcome_user: "Benvenuto, {{user_link}}"
     home: "posizione iniziale"

-    inbox: "in arrivo ({{size}})"
+    inbox: "in arrivo ({{count}})"

     logout: esci
     log_in: entra
     sign_up: iscriviti
     logout: esci
     log_in: entra
     sign_up: iscriviti

diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 73f92c444c1b465506e889e14c5a2fe37b5b5e51..f8a4ffe8f7f6b910a3213a9f12b8977ce5e61c84 100644 (file)
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -297,7 +297,7 @@ nl:
   layouts:
     welcome_user: "Welkom, {{user_link}}"
     home: "home"
   layouts:
     welcome_user: "Welkom, {{user_link}}"
     home: "home"

-    inbox: "Postvak IN ({{size}})"
+    inbox: "Postvak IN ({{count}})"

     logout: uitloggen
     log_in: inloggen
     sign_up: registreren
     logout: uitloggen
     log_in: inloggen
     sign_up: registreren

diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index da9b1626e6454f3f5a5c49b02541731d291a0ee7..31bec632d713c743999b1a03e1a186eb760728f5 100644 (file)
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -300,7 +300,7 @@ pl:
   layouts:
     welcome_user: "Witaj, {{user_link}}"
     home: "główna"
   layouts:
     welcome_user: "Witaj, {{user_link}}"
     home: "główna"

-    inbox: "skrzynka ({{size}})"
+    inbox: "skrzynka ({{count}})"

     logout: wyloguj
     log_in: zaloguj się
     sign_up: zarejestruj
     logout: wyloguj
     log_in: zaloguj się
     sign_up: zarejestruj

diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 9d0de57096e10508c116357318e2bc14a8c611e5..71cd8539125781ce3dd89ce1a5fb4547897df3c6 100644 (file)
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -297,7 +297,7 @@ ru:
   layouts:
     welcome_user: "Добро пожаловать, {{user_link}}"
     home: "домой"
   layouts:
     welcome_user: "Добро пожаловать, {{user_link}}"
     home: "домой"

-    inbox: "входящие ({{size}})"
+    inbox: "входящие ({{count}})"

     logout: выйти
     log_in: войти
     sign_up: регистрация
     logout: выйти
     log_in: войти
     sign_up: регистрация

diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index df023fbc0eab3d7e9f4c17291648bdcb1898e894..7d0f4bbdd862f7193df3af16ceda206d0aa867da 100644 (file)
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -326,7 +326,7 @@ sl:
   layouts:
     welcome_user: "Dobrodošli, {{user_link}}"
     home: "domov"
   layouts:
     welcome_user: "Dobrodošli, {{user_link}}"
     home: "domov"

-    inbox: "prejeta pošta ({{size}})"
+    inbox: "prejeta pošta ({{count}})"

     logout: odjava
     log_in: prijava
     sign_up: vpis
     logout: odjava
     log_in: prijava
     sign_up: vpis

diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 95213a6e1e198e3d26219b1e4221ca91df4049d6..6391c7a9a2526cd9559eacb8de46affb10bf9e58 100644 (file)
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -295,7 +295,7 @@ zh-CN:
   layouts:
     welcome_user: "Welcome, {{user_link}}"
     home: "home"
   layouts:
     welcome_user: "Welcome, {{user_link}}"
     home: "home"

-    inbox: "inbox ({{size}})"
+    inbox: "inbox ({{count}})"

     logout: logout
     log_in: log in
     sign_up: sign up
     logout: logout
     log_in: log in
     sign_up: sign up