Changes for i18n yml

This commit is contained in:
Christophe Vilayphiou committed 2012-09-24 09:02:45 +08:00
1 parent a04e1fd10b
commit bdd5a1a047
170 files changed
+1213 -3715

No files matched your search

+14 -14
View File
@@ -58,14 +58,14 @@ class Admin::ModuleAppsController < ApplicationController
def assign_sub_manager
unless @assign_to_user.nil? || @assign_to_user.admin?
if @module_app.assign_sub_manager(@assign_to_user,current_user)
flash[:notice] = t('admin.app_auth.assigning_manager.add_sub_manager_ok')
flash[:notice] = t('app_auth.assigning_manager.add_manager_ok')
else
flash[:notice] = t('admin.app_auth.assigning_manager.add_sub_manager_fail')
flash[:notice] = t('app_auth.assigning_manager.add_manager_fail')
end
else
flash[:notice] = t('admin.app_auth.assigning_manager.failed_no_user')
flash[:notice] = t('app_auth.failed_no_user')
end
flash[:notice] = t('admin.app_auth.can_not_add_this_user')
flash[:notice] = t('app_auth.can_not_add_this_user')
redirect_to :action => "edit"
end
@@ -73,14 +73,14 @@ class Admin::ModuleAppsController < ApplicationController
def assign_manager
unless @assign_to_user.nil? || @assign_to_user.admin?
if @module_app.assign_manager(@assign_to_user,current_user)
flash[:notice] = t('admin.app_auth.assigning_sub_manager.add_manager_ok')
flash[:notice] = t('app_auth.assigning_sub_manager.add_sub_manager_ok')
else
flash[:notice] = t('admin.app_auth.assigning_sub_manager.add_manager_fail')
flash[:notice] = t('app_auth.assigning_sub_manager.add_sub_manager_fail')
end
else
flash[:notice] = t('admin.app_auth.assigning_sub_manager.failed_no_user')
flash[:notice] = t('app_auth.failed_no_user')
end
flash[:notice] = t('admin.app_auth.can_not_add_this_user')
flash[:notice] = t('app_auth.can_not_add_this_user')
redirect_to :action => "edit"
end
@@ -88,9 +88,9 @@ class Admin::ModuleAppsController < ApplicationController
def remove_manager
@app_manager = AppManager.find(params[:app_manager_id])
if @module_app.remove_manager(@app_manager.user)
flash[:notice] = t('admin.app_auth.delete_manager.success')
flash[:notice] = t('app_auth.delete_manager.success')
else
flash[:notice] = t('admin.app_auth.delete_manager.fail')
flash[:notice] = t('app_auth.delete_manager.fail')
end
redirect_to :action => "edit"
end
@@ -99,9 +99,9 @@ class Admin::ModuleAppsController < ApplicationController
def remove_sub_manager
@app_sub_manager = AppManager.find(params[:app_sub_manager_id])
if @module_app.remove_sub_manager(@app_sub_manager.user)
flash[:notice] = t('admin.app_auth.delete_sub_manager.success')
flash[:notice] = t('app_auth.delete_sub_manager.success')
else
flash[:notice] = t('admin.app_auth.delete_sub_manager.fail')
flash[:notice] = t('app_auth.delete_sub_manager.fail')
end
redirect_to :action => "edit"
end
@@ -115,7 +115,7 @@ class Admin::ModuleAppsController < ApplicationController
return
end
#user is not permited to do that
flash[:notice] = t('admin.app_auth.operation_not_permitted')
flash[:notice] = t('app_auth.operation_not_permitted')
render :nothing => true, :status => 403
end
@@ -127,7 +127,7 @@ class Admin::ModuleAppsController < ApplicationController
return
end
#user is not permited to do that
flash[:notice] = t('admin.app_auth.operation_not_permitted')
flash[:notice] = t('app_auth.operation_not_permitted')
render :nothing => true, :status => 403
end