choteaumt
/
adopt-a-hydrant
mirror of https://github.com/choteaumt/adopt-a-hydrant.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanup internationalization

This commit is contained in:
Erik Michaels-Ober 2011-09-14 18:23:56 -07:00
parent 91c73248d7
commit ada9ba4932
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/views/users/edit.html.haml
View File

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

9
app/views/users/profile.html.haml
View File

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

6
config/locales/en.yml
View File

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