Cleanup internationalization

app/views/users/edit.html.haml

@@ -16,10 +16,9 @@
   %em
     = t("captions.password")
   = f.password_field "password", :tabindex => 6
-  = f.label "current_password", t("labels.password_current"), :id => "user_current_password_label"
+  = f.label "current_password", t("labels.current_password"), :id => "user_current_password_label"
   %em
     = t("captions.current_password")
-    (we need your current password to confirm your changes)
   = f.password_field "current_password", :tabindex => 7
   = f.submit t("buttons.update"), :tabindex => 8
 = render :partial => 'hydrants/back'

app/views/users/profile.html.haml

@@ -1,8 +1,9 @@
 %h2
-  = t("titles.adopted", :hydrant_name => @hydrant.name ? @hydrant.name.titleize : t("defaults.hydrant_name"), :name => @hydrant.user.name)
-- unless @hydrant.user.organization.blank?
-  %h3
-    = "of #{@hydrant.user.organization}"
+  = t("titles.adopted", :hydrant_name => @hydrant.name ? @hydrant.name.titleize : t("defaults.hydrant_name"))
+  %br
+  = t("titles.byline", :name => @hydrant.user.name)
+  %br
+  = t("titles.ofline", :organization => @hydrant.user.organization) unless @hydrant.user.organization.blank?
 - if user_signed_in?
   = render :partial => 'users/reminder'
   = render :partial => 'hydrants/steal'

config/locales/en.yml

@@ -16,8 +16,8 @@ en:
     steal: "Steal this hydrant"
     update: "Update"
   captions:
+    current_password: "(we need your current password to confirm your changes)"
     password: "(leave blank if you don't want to change it)"
-    password_current: "(we need your current password to confirm your changes)"
     private: "(private)"
     public: "(may be visible to other users)"
   defaults:
@@ -51,9 +51,11 @@ en:
     remembered_password: "Never mind. I remembered my password."
   titles:
     adopt: "Adopt this Hydrant"
-    adopted: "%{hydrant_name} has been adopted by %{name}"
+    adopted: "%{hydrant_name} has been adopted"
+    byline: "by %{name}"
     edit_profile: "Edit your Profile"
     main: "Adopt a Hydrant"
+    ofline: "of %{organization}"
     thank_you: "Thank you for adopting this hydrant!"
     tos: "Terms of Service"
   sponsors: