Mercurial > hg > soundsoftware-site
changeset 718:378aca14739f cannam
Merge from branch "feature_36"
| author | Chris Cannam |
|---|---|
| date | Mon, 17 Oct 2011 16:56:41 +0100 |
| parents | fce7374e48b7 (diff) ebca856bd627 (current diff) |
| children | 5eb7efd59ed7 |
| files | |
| diffstat | 2 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/app/views/account/register.rhtml Fri Sep 23 18:15:01 2011 +0100 +++ b/app/views/account/register.rhtml Mon Oct 17 16:56:41 2011 +0100 @@ -29,9 +29,10 @@ <p><label for="user_mail"><%=l(:field_mail)%> <span class="required">*</span></label> <%= text_field 'user', 'mail' %></p> +<!-- We only support English in this site <p><label for="user_language"><%=l(:field_language)%></label> <%= select("user", "language", lang_options_for_select) %></p> - +--> <h3><%=l(:label_ssamr_details)%></h3>
--- a/config/locales/en.yml Fri Sep 23 18:15:01 2011 +0100 +++ b/config/locales/en.yml Mon Oct 17 16:56:41 2011 +0100 @@ -169,7 +169,7 @@ notice_failed_to_save_issues: "Failed to save %{count} issue(s) on %{total} selected: %{ids}." notice_failed_to_save_members: "Failed to save member(s): %{errors}." notice_no_issue_selected: "No issue is selected! Please, check the issues you want to edit." - notice_account_pending: "Your account was created and is now pending administrator approval." + notice_account_pending: "Your account is now awaiting administrator approval. You will receive a notification email when your account has been activated." notice_default_data_loaded: Default configuration successfully loaded. notice_unable_delete_version: Unable to delete version. notice_unable_delete_time_entry: Unable to delete time log entry.