locales

app/models/university/with_invoice.rb

@@ -5,7 +5,7 @@ module University::WithInvoice
 
     before_save :denormalize_invoice_date
 
-    scope :contributing, -> { where.not(contribution_amount: [nil, 0.0]) }
+    scope :contributing, -> { where.not(contribution_amount: [nil, 0.0, '', 0]) }
 
     def invoice_proximity
       if next_invoice_in_days < 30

config/locales/server_admin/en.yml

@@ -3,7 +3,7 @@ en:
     blocks:
       about: About
       blocks_saved:
-        one: "1 block re-saved"
+        one: "%{count} block re-saved"
         other: "%{count} blocks re-saved"
       data: Data
       open: Open
@@ -27,7 +27,7 @@ en:
     see_list: See the list
     universities:
       contributing:
-        one: 1 contributing university
+        one: "%{count} contributing university"
         other: "%{count} contributing universities"
       contributions_total: Contributions (total)
       invoice_informations: Invoice informations

config/locales/server_admin/fr.yml

@@ -3,7 +3,7 @@ fr:
     blocks:
       about: Sujet
       blocks_saved:
-        one: "1 bloc re-sauvé"
+        one: "%{count} bloc re-sauvé"
         other: "%{count} blocs re-sauvés"
       data: Données
       open: Ouvrir
@@ -27,7 +27,7 @@ fr:
     see_list: Voir la liste
     universities:
       contributing:
-        one: 1 université contributrice
+        one: "%{count} université contributrice"
         other: "%{count} universités contributrices"
       contributions_total: Contributions (total)
       invoice_informations: Données de facturation

config/server_navigation.rb

@@ -5,11 +5,11 @@ SimpleNavigation::Configuration.run do |navigation|
   navigation.selected_class = 'active'
   navigation.items do |primary|
     primary.item  :dashboard,
-                  t('dashboard'),
+                  t('admin.dashboard'),
                   server_root_path,
                   { kind: :header, highlights_on: %r{server$} }
     primary.item  :server,
-                  t('server'),
+                  t('menu.server_admin'),
                   nil,
                   { kind: :header }
     primary.item  :universities,