diff options
| author | Azamat Hackimov <azamat.hackimov@gmail.com> | 2010-04-03 11:54:24 +0000 |
|---|---|---|
| committer | Azamat Hackimov <azamat.hackimov@gmail.com> | 2010-04-03 11:54:24 +0000 |
| commit | eb80b79c26664d48e910902b58ca9a9b135b09e6 (patch) | |
| tree | fc8a181ffa84af2544cc5d73c7aeb625e304b97e /app/controllers | |
| parent | f2993f6ed02e81f264359c8b7f45071a59cd0474 (diff) | |
| download | redmine-eb80b79c26664d48e910902b58ca9a9b135b09e6.tar.gz redmine-eb80b79c26664d48e910902b58ca9a9b135b09e6.zip | |
New strings to localization (#5225)
* error_can_not_delete_custom_field: Unable to delete custom field
* error_unable_to_connect: Unable to connect ({{value}})
* error_can_not_remove_role: This role is in use and can not be deleted.
* error_can_not_delete_tracker: This tracker contains issues and can't be deleted.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3627 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/auth_sources_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/custom_fields_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/roles_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/trackers_controller.rb | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/app/controllers/auth_sources_controller.rb b/app/controllers/auth_sources_controller.rb index eaedb5ba3..75a321ffe 100644 --- a/app/controllers/auth_sources_controller.rb +++ b/app/controllers/auth_sources_controller.rb @@ -63,7 +63,7 @@ class AuthSourcesController < ApplicationController @auth_method.test_connection flash[:notice] = l(:notice_successful_connection) rescue => text - flash[:error] = "Unable to connect (#{text})" + flash[:error] = l(:error_unable_to_connect, text.message) end redirect_to :action => 'index' end diff --git a/app/controllers/custom_fields_controller.rb b/app/controllers/custom_fields_controller.rb index e8e9e4947..51457e74c 100644 --- a/app/controllers/custom_fields_controller.rb +++ b/app/controllers/custom_fields_controller.rb @@ -56,7 +56,7 @@ class CustomFieldsController < ApplicationController @custom_field = CustomField.find(params[:id]).destroy redirect_to :action => 'index', :tab => @custom_field.class.name rescue - flash[:error] = "Unable to delete custom field" + flash[:error] = l(:error_can_not_delete_custom_field) redirect_to :action => 'index' end end diff --git a/app/controllers/roles_controller.rb b/app/controllers/roles_controller.rb index 00902735c..0809f9041 100644 --- a/app/controllers/roles_controller.rb +++ b/app/controllers/roles_controller.rb @@ -57,7 +57,7 @@ class RolesController < ApplicationController @role.destroy redirect_to :action => 'index' rescue - flash[:error] = 'This role is in use and can not be deleted.' + flash[:error] = l(:error_can_not_remove_role) redirect_to :action => 'index' end diff --git a/app/controllers/trackers_controller.rb b/app/controllers/trackers_controller.rb index 8a44ad825..efd9de945 100644 --- a/app/controllers/trackers_controller.rb +++ b/app/controllers/trackers_controller.rb @@ -55,7 +55,7 @@ class TrackersController < ApplicationController def destroy @tracker = Tracker.find(params[:id]) unless @tracker.issues.empty? - flash[:error] = "This tracker contains issues and can\'t be deleted." + flash[:error] = l(:error_can_not_delete_tracker) else @tracker.destroy end |