summaryrefslogtreecommitdiff
path: root/app/controllers/profiles/notifications_controller.rb
diff options
context:
space:
mode:
authorLarry Li <larryli@qq.com>2016-03-24 06:21:03 +0800
committerLarry Li <larryli@qq.com>2016-03-24 06:21:03 +0800
commitb0a44cb0c867b2eec84ba8bb4ac303d829848195 (patch)
tree70e71494ecbe50706ba756c54ac3d6e440dcd7ae /app/controllers/profiles/notifications_controller.rb
parent3192db707183244bb21af382fe709c963ae96348 (diff)
downloadgitlab-ce-b0a44cb0c867b2eec84ba8bb4ac303d829848195.tar.gz
导入上一版本 8.5 汉化v8.6.0.zh0
Signed-off-by: Larry Li <larryli@qq.com>
Diffstat (limited to 'app/controllers/profiles/notifications_controller.rb')
-rw-r--r--app/controllers/profiles/notifications_controller.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/app/controllers/profiles/notifications_controller.rb b/app/controllers/profiles/notifications_controller.rb
index 1fd1d6882df..46d5badc1a3 100644
--- a/app/controllers/profiles/notifications_controller.rb
+++ b/app/controllers/profiles/notifications_controller.rb
@@ -1,3 +1,4 @@
+#encoding: utf-8
class Profiles::NotificationsController < Profiles::ApplicationController
def show
@user = current_user
@@ -24,9 +25,9 @@ class Profiles::NotificationsController < Profiles::ApplicationController
respond_to do |format|
format.html do
if @saved
- flash[:notice] = "Notification settings saved"
+ flash[:notice] = "通知设置已保存"
else
- flash[:alert] = "Failed to save new settings"
+ flash[:alert] = "保存新设置失败"
end
redirect_back_or_default(default: profile_notifications_path)