From ec7fe1301389472fa3a290d02ef62ee398b476d9 Mon Sep 17 00:00:00 2001 From: MischaTheEvil Date: Sat, 1 Aug 2009 03:50:56 +0200 Subject: [PATCH] Renamed "edit" button on edit view to a "save" button using @:name => "save"@ and including the related i18n. TBD: update French i18n. --- app/controllers/newissuealerts_controller.rb | 6 +++--- app/views/newissuealerts/edit.html.erb | 2 +- config/locales/en.yml | 6 +++--- config/locales/fr.yml | 6 +++--- lang/en.yml | 6 +++--- lang/fr.yml | 6 +++--- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/app/controllers/newissuealerts_controller.rb b/app/controllers/newissuealerts_controller.rb index 4c28e86..70c6531 100644 --- a/app/controllers/newissuealerts_controller.rb +++ b/app/controllers/newissuealerts_controller.rb @@ -37,11 +37,11 @@ def edit else flash.now[:error] = l(:newissuealerts_deletion_failed) end - elsif params[:edit] + elsif params[:save] if @newissuealert.update_attributes(params[:newissuealert]) - flash[:notice] = l(:newissuealerts_update_success) + flash[:notice] = l(:newissuealerts_save_success) else - flash.now[:error] = l(:newissuealerts_update_failed) + flash.now[:error] = l(:newissuealerts_save_failed) end end redirect_to :action => 'index', :project_id => @project.identifier diff --git a/app/views/newissuealerts/edit.html.erb b/app/views/newissuealerts/edit.html.erb index 89c8403..2031bbf 100644 --- a/app/views/newissuealerts/edit.html.erb +++ b/app/views/newissuealerts/edit.html.erb @@ -9,7 +9,7 @@

<%= f.label l(:enabled) %> <%= f.check_box :enabled %>

-

<%= submit_tag l(:edit), :name => "edit" %> <%= submit_tag l(:delete), :name => "delete", :confirm => l(:newissuealerts_deletion_confirm) %>

+

<%= submit_tag l(:save), :name => "save" %> <%= submit_tag l(:delete), :name => "delete", :confirm => l(:newissuealerts_deletion_confirm) %>

<% end %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 5125708..8dee068 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -5,7 +5,7 @@ en: email_addresses: Email Addresses email_addresses_comma_separated: Emails are comma separated newissuealerts_deletion_confirm: Are you sure you want to delete this item? - edit: Edit + save: Save delete: Delete enabled: Enabled # new view @@ -20,7 +20,7 @@ en: newissuealerts_creation_failed: New Issue Alert could not be saved newissuealerts_deletion_success: New Issue Alert successfully deleted newissuealerts_deletion_failed: New Issue Alert could not be deleted - newissuealerts_update_success: New Issue Alert successfully updated - newissuealerts_update_failed: New Issue Alert could not be updated + newissuealerts_save_success: New Issue Alert successfully saved + newissuealerts_save_failed: New Issue Alert could not be saved # mailer newissuealerts_footer: You have received this notification because this email was added to the New Issue Alert plugin diff --git a/config/locales/fr.yml b/config/locales/fr.yml index e8325b7..0d50a86 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -5,7 +5,7 @@ fr: enabled: Actif email_addresses_comma_separated: Les emails sont séparés par des virgules newissuealerts_deletion_confirm: Etes-vous sûr de vouloir éffacer cette alerte? - edit: Editer + save: Mémoriser delete: Effacer # new view newissuealerts_new: Création d'une New Issue Alert pour %s @@ -19,8 +19,8 @@ fr: newissuealerts_creation_failed: New Issue Alert n'a pu être créée newissuealerts_deletion_success: New Issue Alert éffacée avec succès newissuealerts_deletion_failed: New Issue Alert n'a pu être éffacée - newissuealerts_update_success: New Issue Alert a été mis à jour avec succès - newissuealerts_update_failed: New Issue Alert n'a pu être mis à + newissuealerts_save_success: New Issue Alert a été mis à jour avec succès + newissuealerts_save_failed: New Issue Alert n'a pu être mis à # mailer newissuealerts_footer: Vous avez reçu cet email parce que cette adresse email a été ajouté au plugin New Issue Alert diff --git a/lang/en.yml b/lang/en.yml index 861616d..ec1e8a1 100644 --- a/lang/en.yml +++ b/lang/en.yml @@ -5,7 +5,7 @@ email_addresses: Email Addresses email_addresses_comma_separated: Emails are comma separated newissuealerts_deletion_confirm: Are you sure you want to delete this item? enabled: Enabled -edit: Edit +save: Save delete: Delete # new view newissuealerts_new: Creating a New Issue Alert for %s @@ -19,7 +19,7 @@ newissuealerts_creation_success: New Issue Alert successfully created newissuealerts_creation_failed: New Issue Alert could not be saved newissuealerts_deletion_success: New Issue Alert successfully deleted newissuealerts_deletion_failed: New Issue Alert could not be deleted -newissuealerts_update_success: New Issue Alert successfully updated -newissuealerts_update_failed: New Issue Alert could not be updated +newissuealerts_save_success: New Issue Alert successfully saved +newissuealerts_save_failed: New Issue Alert could not be saved # mailer newissuealerts_footer: You have received this notification because this email was added to the New Issue Alert plugin diff --git a/lang/fr.yml b/lang/fr.yml index e787d54..327470f 100644 --- a/lang/fr.yml +++ b/lang/fr.yml @@ -4,7 +4,7 @@ email_addresses: Adresses Emails enabled: Actif email_addresses_comma_separated: Les emails sont séparés par des virgules newissuealerts_deletion_confirm: Etes-vous sûr de vouloir éffacer cette alerte? -edit: Editer +save: Mémoriser delete: Effacer # new view newissuealerts_new: Création d'une New Issue Alert pour %s @@ -18,8 +18,8 @@ newissuealerts_creation_success: New Issue Alert créée avec succ&e newissuealerts_creation_failed: New Issue Alert n'a pu être créée newissuealerts_deletion_success: New Issue Alert éffacée avec succès newissuealerts_deletion_failed: New Issue Alert n'a pu être éffacée -newissuealerts_update_success: New Issue Alert a été mis à jour avec succès -newissuealerts_update_failed: New Issue Alert n'a pu être mis à +newissuealerts_save_success: New Issue Alert a été mis à jour avec succès +newissuealerts_save_failed: New Issue Alert n'a pu être mis à # mailer newissuealerts_footer: Vous avez reçu cet email parce que cette adresse email a été ajouté au plugin New Issue Alert