diff options
| author | cedricnjanga | 2018-03-27 23:44:03 -0700 |
|---|---|---|
| committer | cedricnjanga | 2018-03-27 23:44:03 -0700 |
| commit | 9af9d272090c1086422fbb6d3af928c35166f619 (patch) | |
| tree | 182119d56f89d28ae8ae4eff80de1d1635b305b7 | |
| parent | 1aaa07157292e5a02bca5217ed5c18e352803ae6 (diff) | |
| download | chouette-core-9af9d272090c1086422fbb6d3af928c35166f619.tar.bz2 | |
Refs #6156 Add will paginate for JP
| -rw-r--r-- | config/locales/will_paginate.en.yml | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/config/locales/will_paginate.en.yml b/config/locales/will_paginate.en.yml index 563ea7d29..e3b6769ba 100644 --- a/config/locales/will_paginate.en.yml +++ b/config/locales/will_paginate.en.yml @@ -39,4 +39,8 @@ en: other: "%{model} 1 to %{count} out of %{count}" multi_page: "%{model} list %{from} to %{to} out of %{count}" - multi_page_html: "%{model} list %{from} to %{to} out of %{count}"
\ No newline at end of file +<<<<<<< Updated upstream + multi_page_html: "%{model} list %{from} to %{to} out of %{count}" +======= + multi_page_html: "%{model} list %{from} to %{to} out of %{count}" +>>>>>>> Stashed changes |