[activescaffoldlocalize commit] r98 - in trunk: . lang

[codesite...@google.com]

Author: edwin.moss
Date: Mon Mar 3 07:37:17 2008
New Revision: 98

Modified:
trunk/environment.rb
trunk/lang/fr-ca.rb

Log:
Fix fr-ca and environment.rb

Modified: trunk/environment.rb
==============================================================================
--- trunk/environment.rb (original)
+++ trunk/environment.rb Mon Mar 3 07:37:17 2008
@@ -1,5 +1,4 @@
-require 'localization'
-
+require "#{File.dirname __FILE__}/lib/localization"
require "#{File.dirname __FILE__}/lib/extensions/active_record"
require "#{File.dirname __FILE__}/lib/extensions/form_options_helper"
require "#{File.dirname __FILE__}/lib/helpers/list_column_helpers"

Modified: trunk/lang/fr-ca.rb
==============================================================================
--- trunk/lang/fr-ca.rb (original)
+++ trunk/lang/fr-ca.rb Mon Mar 3 07:37:17 2008
@@ -73,14 +73,14 @@
# don't translate, just re-order
:date_helper_date_formats => {
:default => "%d-%m-%Y",
- :short => "%b %e",
- :long => "%B %e, %Y"
+ :short => "%e %b",
+ :long => "%e %B %Y"
},
# don't translate, just re-order
:date_helper_time_formats => {
:default => "%a, %d %b %Y %H:%M:%S %z",
- :short => "%d %b %H:%M",
- :long => "%B %d, %Y %H:%M"
+ :short => "%e %b %H:%M",
+ :long => "%e %B %Y %H:%M"
},
# added at the end of date if your date system doesn't use a 24
hours system
:date_helper_am => 'am',
@@ -376,6 +376,6 @@
["Western Sahara", "Western Sahara"],
["Yemen", "Yemen"],
["Zambia", "Zambia"],
- ["Zimbabwe" "Zimbabwe"]
+ ["Zimbabwe", "Zimbabwe"]
]
end