Merge pull request ruby-china#24 from songlipeng2003/master

重复登录时，devise报告缺少zh-CN.devise.failure.already_authenticated错误
flaneur2020 · May 1, 2012 · 03a4aec · 03a4aec
2 parents 7de3c36 + d625ebd
commit 03a4aec
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/config/locales/devise.zh-CN.yml b/config/locales/devise.zh-CN.yml
@@ -10,6 +10,7 @@
       user:
         failure: '三方登陆过程异常，请重试。'
     failure:
+      already_authenticated: '您已经登录.'
       unauthenticated: '继续操作前请注册或者登录.'
       unconfirmed: '请先激活您的帐号'
       locked: '您的帐号已被锁定.'