more tranlations for validations. Bug fix for the missing translation of the gps...

diff --git a/app/controllers/trace_controller.rb b/app/controllers/trace_controller.rb
index 1787bb196a162e225631e67d0e22c1db5e648de4..532893ef170ebc238523b8487db1cb61adffc5a8 100644 (file)
--- a/app/controllers/trace_controller.rb
+++ b/app/controllers/trace_controller.rb
@@ -142,6 +142,7 @@ class TraceController < ApplicationController
         @trace.errors.add(:gpx_file, "can't be blank")
       end
     end
+    @title = I18n.t('trace.create.upload_trace')
   end
 
   def data

diff --git a/app/models/user.rb b/app/models/user.rb
index 683fcc96baceea7cb6453212e7c9ac912b964971..308e0a2ce58cbc3ab428cad708f9f6b4bedf6f28 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -12,8 +12,8 @@ class User < ActiveRecord::Base
   has_many :changesets
 
   validates_presence_of :email, :display_name
-  validates_confirmation_of :email, :message => 'Email addresses must match'
-  validates_confirmation_of :pass_crypt, :message => 'Password must match the confirmation password'
+  validates_confirmation_of :email#, :message => ' addresses must match'
+  validates_confirmation_of :pass_crypt#, :message => ' must match the confirmation password'
   validates_uniqueness_of :display_name, :allow_nil => true
   validates_uniqueness_of :email
   validates_length_of :pass_crypt, :within => 8..255

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 7f8320cba374be7dbc18621089b4da36a81a2628..6a4c14d2a1f39466ffe7b6be5ee2507e217b3ae8 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1,4 +1,75 @@
 en:
+  activerecord:
+    # Translates all the model names, which is used in error handling on the web site
+    models:
+      acl: "Access Control List"
+      changeset: "Changeset"
+      changeset_tag: "Changeset Tag"
+      country: "Country"
+      diary_comment: "Diary Comment"
+      diary_entry: "Diary Entry"
+      friend: "Friend"
+      language: "Language"
+      message: "Message"
+      node: "Node"
+      node_tag: "Node Tag"
+      notifier: "Notifier"
+      old_node: "Old Node"
+      old_node_tag: "Old Node Tag"
+      old_relation: "Old Relation"
+      old_relation_member: "Old Relation Member"
+      old_relation_tag: "Old Relation Tag"
+      old_way: "Old Way"
+      old_way_node: "Old Way Node"
+      old_way_tag: "Old Way Tag"
+      relation: "Relation"
+      relation_member: "Relation Member"
+      relation_tag: "Relation Tag"
+      session: "Session"
+      trace: "Trace"
+      tracepoint: "Trace Point"
+      tracetag: "Trace Tag"
+      user: "User"
+      user_preference: "User Preference"
+      user_token: "User Token"
+      way: "Way"
+      way_node: "Way Node"
+      way_tag: "Way Tag"
+    # Translates all the model attributes, which is used in error handling on the web site
+    # Only the ones that are used on the web site are translated at the moment
+    attributes:
+      diary_comment:
+        body: "Body"
+      diary_entry:
+        user: "User"
+        title: "Title"
+        latitude: "Latitude"
+        longitude: "Longitude"
+        language: "Language"
+      friend:
+        user: "User"
+        friend: "Friend"
+      trace:
+        user: "User"
+        visible: "Visible"
+        name: "Name"
+        size: "Size"
+        latitude: "Latitude"
+        longitude: "Longitude"
+        public: "Public"
+        description: "Description"
+      message:
+        sender: "Sender"
+        title: "Title"
+        body: "Body"
+        recipient: "Recipient"
+      user:
+        email: "Email"
+        active: "Active"
+        display_name: "Display Name"
+        description: "Description"
+        languages: "Languages"
+        pass_crypt: "Password"
   map:
     view: View
     edit: Edit
@@ -349,7 +420,7 @@ en:
       map_key: "Map key"
   trace:
     create:
-      upload: "Upload GPS Trace"
+      upload_trace: "Upload GPS Trace"
     edit:
       filename: "Filename:"
       uploaded_at: "Uploaded at:"