aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Gemfile1
-rw-r--r--Gemfile.lock8
-rw-r--r--config/locales/companies.yml10
-rw-r--r--config/locales/connection_links.yml10
-rw-r--r--config/locales/imports.yml10
-rw-r--r--config/locales/lines.yml13
-rw-r--r--config/locales/networks.yml10
-rw-r--r--config/locales/routes.yml10
-rw-r--r--config/locales/stop_areas.yml10
-rw-r--r--config/locales/stop_points.yml10
-rw-r--r--config/locales/time_tables.yml10
-rw-r--r--config/locales/will_paginate.yml10
12 files changed, 82 insertions, 30 deletions
diff --git a/Gemfile b/Gemfile
index f3659bc37..560716172 100644
--- a/Gemfile
+++ b/Gemfile
@@ -28,6 +28,7 @@ gem 'cocoon'
gem 'formtastic', '2.0.2'
gem 'inherited_resources'
gem 'will_paginate', '~> 3.0'
+# gem 'will-paginate-i18n','~> 0.1.5'
gem 'ransack'
gem 'squeel'
gem 'RedCloth'
diff --git a/Gemfile.lock b/Gemfile.lock
index 35c7abe78..03062f915 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,6 @@
GIT
remote: git://chouette.dryade.priv/ninoxe
- revision: dcf5c4e0f9d1abf7524d1ae9bf672276ab978052
+ revision: f6423a2f1911989a1d13cc47d9922613b1767864
specs:
ninoxe (0.0.8)
GeoRuby
@@ -71,7 +71,6 @@ GEM
remote: http://rubygems.org/
specs:
GeoRuby (1.3.4)
- RedCloth (4.2.9)
RedCloth (4.2.9-java)
SyslogLogger (1.4.1)
actionmailer (3.1.3)
@@ -108,7 +107,6 @@ GEM
acts_as_list (0.1.6)
addressable (2.2.8)
arel (2.2.3)
- bcrypt-ruby (3.0.1)
bcrypt-ruby (3.0.1-java)
bouncy-castle-java (1.5.0146.1)
builder (3.0.0)
@@ -187,11 +185,8 @@ GEM
jruby-openssl (0.7.6.1)
bouncy-castle-java (>= 1.5.0146.1)
jruby-rack (1.1.5)
- json (1.7.3)
json (1.7.3-java)
json_pure (1.7.3)
- launchy (2.1.0)
- addressable (~> 2.2.6)
launchy (2.1.0-java)
addressable (~> 2.2.6)
ffi (~> 1.0.9)
@@ -212,7 +207,6 @@ GEM
net-ssh (2.3.0)
net-ssh-gateway (1.1.0)
net-ssh (>= 1.99.1)
- nokogiri (1.5.2)
nokogiri (1.5.2-java)
orm_adapter (0.0.7)
polyamorous (0.5.0)
diff --git a/config/locales/companies.yml b/config/locales/companies.yml
index 86af20ab2..8c91bec4a 100644
--- a/config/locales/companies.yml
+++ b/config/locales/companies.yml
@@ -17,7 +17,10 @@ en:
activerecord:
models:
- company: Company
+ company:
+ zero: company
+ one: company
+ other: companies
attributes:
company:
registrationnumber: "Registration number"
@@ -58,7 +61,10 @@ fr:
activerecord:
models:
- company: Transporteur
+ company:
+ zero: transporteur
+ one: transporteur
+ other: transporteurs
attributes:
company:
registrationnumber: "Numéro d'enregistrement"
diff --git a/config/locales/connection_links.yml b/config/locales/connection_links.yml
index 43602d5dd..469eae937 100644
--- a/config/locales/connection_links.yml
+++ b/config/locales/connection_links.yml
@@ -27,7 +27,10 @@ en:
title: "Select start and end stops for %{connection_link}"
activerecord:
models:
- connection_link: Connection link
+ connection_link:
+ zero: connection link
+ one: connection link
+ other: connection links
attributes:
connection_link:
departure: Start of link
@@ -84,7 +87,10 @@ fr:
title: "Sélection des arrêts de départ et d'arrivée de %{connection_link}"
activerecord:
models:
- connection_link: Correspondance
+ connection_link:
+ zero: correspondance
+ one: correspondance
+ other: correspondances
attributes:
connection_link:
departure: Arrêt de départ
diff --git a/config/locales/imports.yml b/config/locales/imports.yml
index 2c30e30d6..d4c8b2d7c 100644
--- a/config/locales/imports.yml
+++ b/config/locales/imports.yml
@@ -9,6 +9,11 @@ en:
index:
title: Imports
activerecord:
+ models:
+ import:
+ zero: import
+ one: import
+ other: imports
attributes:
import:
resources: File to import
@@ -23,6 +28,11 @@ fr:
index:
title: Imports
activerecord:
+ models:
+ import:
+ zero: import
+ one: import
+ other: imports
attributes:
import:
resources: Fichier à importer
diff --git a/config/locales/lines.yml b/config/locales/lines.yml
index 9b58eeeac..186a09f71 100644
--- a/config/locales/lines.yml
+++ b/config/locales/lines.yml
@@ -22,12 +22,15 @@ en:
multi_selection_enable: Enable multiple selection
multi_selection_disable: Disable multiple selection
delete_selected: Delete lines
- export_selected: Export linges
+ export_selected: Export lines
select_all: Select all
deselect_all: Deselect all
activerecord:
models:
- line: Line
+ line:
+ zero: line
+ one: line
+ other: lines
attributes:
line:
network: Network
@@ -77,7 +80,10 @@ fr:
deselect_all: Tout désélectionner
activerecord:
models:
- line: Ligne
+ line:
+ zero: ligne
+ one: ligne
+ other: lignes
attributes:
line:
network: Réseau
@@ -97,4 +103,3 @@ fr:
line:
registrationnumber: "caractères autorisés : alphanumériques et 'souligné'"
objectid: "[prefixe]:Line:[clé_unique] caractères autorisés : alphanumériques et 'souligné' pour le préfixe, la clé unique accepte en plus le 'moins'"
-
diff --git a/config/locales/networks.yml b/config/locales/networks.yml
index 06c7396cf..7f24081a6 100644
--- a/config/locales/networks.yml
+++ b/config/locales/networks.yml
@@ -17,7 +17,10 @@ en:
activerecord:
models:
- network: Network
+ network:
+ zero: network
+ one: network
+ other: networks
attributes:
network:
registrationnumber: "Registration number"
@@ -56,7 +59,10 @@ fr:
name: Nom
activerecord:
models:
- network: Réseau
+ network:
+ zero: réseau
+ one: réseau
+ other: réseaux
attributes:
network:
registrationnumber: "Numéro d'enregistrement"
diff --git a/config/locales/routes.yml b/config/locales/routes.yml
index 35bc2cd12..fbea68a7d 100644
--- a/config/locales/routes.yml
+++ b/config/locales/routes.yml
@@ -20,7 +20,10 @@ en:
selection_all: All
activerecord:
models:
- route: Route
+ route:
+ zero: route
+ one: route
+ other: routes
attributes:
route:
line: Line
@@ -58,7 +61,10 @@ fr:
selection_all: Tous
activerecord:
models:
- route: "Séquence d'arrêts"
+ route:
+ zero: "Séquence d'arrêts"
+ one: "Séquence d'arrêts"
+ other: "Séquences d'arrêts"
attributes:
route:
line: Ligne
diff --git a/config/locales/stop_areas.yml b/config/locales/stop_areas.yml
index c6d5f9274..45bbbdb9e 100644
--- a/config/locales/stop_areas.yml
+++ b/config/locales/stop_areas.yml
@@ -31,7 +31,10 @@ en:
title: Add children of stop area %{stop_area}
activerecord:
models:
- stop_area: Stop area
+ stop_area:
+ zero: stop area
+ one: stop area
+ other: stop areas
attributes:
stop_area:
name: Name
@@ -93,7 +96,10 @@ fr:
title: Ajouter les enfants de l'arrêt %{stop_area}
activerecord:
models:
- stop_area: Arrêt
+ stop_area:
+ zero: arrêt
+ one: arrêt
+ other: arrêts
attributes:
stop_area:
name: Nom
diff --git a/config/locales/stop_points.yml b/config/locales/stop_points.yml
index cc40ba10a..53664ff07 100644
--- a/config/locales/stop_points.yml
+++ b/config/locales/stop_points.yml
@@ -21,7 +21,10 @@ en:
no_stop_point: No stop point on route
activerecord:
models:
- stop_point: Stop point on route
+ stop_point:
+ zero: stop point on route
+ one: stop point on route
+ other: stop points on route
attributes:
stop_point:
@@ -48,6 +51,9 @@ fr:
no_stop_point: Aucun arrêt dans la séquence
activerecord:
models:
- stop_point: "Arrêt sur séquence d'arrêts"
+ stop_point:
+ zero: "arrêt sur séquence d'arrêts"
+ one: "arrêt sur séquence d'arrêts"
+ other: "arrêts sur séquence d'arrêts"
attributes:
stop_point:
diff --git a/config/locales/time_tables.yml b/config/locales/time_tables.yml
index 5e0f44be7..e10d8a5f8 100644
--- a/config/locales/time_tables.yml
+++ b/config/locales/time_tables.yml
@@ -27,7 +27,10 @@ en:
selection_all: All
activerecord:
models:
- time_table: Timetable
+ time_table:
+ zero: timetable
+ one: timetable
+ other: timetables
attributes:
time_table:
comment: Comment
@@ -85,7 +88,10 @@ fr:
selection_all: Tous
activerecord:
models:
- time_table: Calendrier
+ time_table:
+ zero: calendrier
+ one: calendrier
+ other: calendriers
attributes:
time_table:
comment: Description
diff --git a/config/locales/will_paginate.yml b/config/locales/will_paginate.yml
index 4978c358d..bd8dbbc32 100644
--- a/config/locales/will_paginate.yml
+++ b/config/locales/will_paginate.yml
@@ -6,11 +6,11 @@ en:
page_entries_info:
single_page:
- zero: "No %{model} found"
+ zero: "No item found"
one: "1 %{model} shown"
other: "%{count} %{model} shown"
single_page_html:
- zero: "No %{model} found"
+ zero: "No item found"
one: "<b>1</b> %{model} shown"
other: "<b>%{count}</b> %{model} shown"
@@ -25,12 +25,12 @@ fr:
page_entries_info:
single_page:
- zero: "Aucun(e) %{model} trouvé(e)"
+ zero: "Aucun élément trouvé"
one: "1 %{model} affiché(e)"
other: "%{count} %{model} affiché(e)s"
single_page_html:
- zero: "Aucun(e) %{model} trouvé(e)"
- one: "<b>1</b> %{model} affiché(e)s"
+ zero: "Aucun élément trouvé"
+ one: "<b>1</b> %{model} affiché(e)"
other: "<b>%{count}</b> %{model} affiché(e)s"
multi_page: "%{model} %{from} - %{to} sur %{count} au total"
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-01 11:51:18 +0000