This repository has been archived by the owner on Feb 22, 2024. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 513
Dynamic translation and Post view configuration changes #758
Open
kantorii
wants to merge
4
commits into
pallets-eco:develop
Choose a base branch
from
kantorii:20180221d_pull_request
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
9fb01cf
Prevent translated messages from being cached.
kantorii 19edbb1
Merge branch 'develop' into 20180221c_post_3.0.0
kantorii 868f2a5
Don't flash message if there was an error sending welcome email.
kantorii 517f1dd
Reflect changes suggested by @jirikuncar
kantorii File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
328 changes: 328 additions & 0 deletions
328
flask_security/translations/ja_JP/LC_MESSAGES/flask_security.po
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,328 @@ | ||
# Translations template for Flask-Security. | ||
# Copyright (C) 2017 CERN | ||
# This file is distributed under the same license as the Flask-Security | ||
# project. | ||
# FIRST AUTHOR <EMAIL@ADDRESS>, 2017. | ||
# | ||
msgid "" | ||
msgstr "" | ||
"Project-Id-Version: Flask-Security 2.0.1\n" | ||
"Report-Msgid-Bugs-To: info@inveniosoftware.org\n" | ||
"POT-Creation-Date: 2017-06-06 13:23+0200\n" | ||
"PO-Revision-Date: 2018-01-25 14:12+0900\n" | ||
"Language-Team: \n" | ||
"MIME-Version: 1.0\n" | ||
"Content-Type: text/plain; charset=UTF-8\n" | ||
"Content-Transfer-Encoding: 8bit\n" | ||
"Generated-By: Babel 2.4.0\n" | ||
"X-Generator: Poedit 2.0.6\n" | ||
"Last-Translator: \n" | ||
"Plural-Forms: nplurals=1; plural=0;\n" | ||
"Language: ja\n" | ||
|
||
#: flask_security/core.py:99 | ||
msgid "Login Required" | ||
msgstr "ログインが必要です" | ||
|
||
#: flask_security/core.py:100 | ||
msgid "Welcome" | ||
msgstr "ようこそ" | ||
|
||
#: flask_security/core.py:101 | ||
msgid "Please confirm your email" | ||
msgstr "メール アドレスの検証" | ||
|
||
#: flask_security/core.py:102 | ||
msgid "Login instructions" | ||
msgstr "ログイン手順" | ||
|
||
#: flask_security/core.py:103 | ||
#: flask_security/templates/security/email/reset_notice.html:1 | ||
msgid "Your password has been reset" | ||
msgstr "パスワード変更" | ||
|
||
#: flask_security/core.py:104 | ||
msgid "Your password has been changed" | ||
msgstr "パスワードが変更されました。" | ||
|
||
#: flask_security/core.py:106 | ||
msgid "Password reset instructions" | ||
msgstr "パスワード再設定手順" | ||
|
||
#: flask_security/core.py:132 | ||
msgid "You do not have permission to view this resource." | ||
msgstr "アクセス権がありません" | ||
|
||
#: flask_security/core.py:134 | ||
#, python-format | ||
msgid "Thank you. Confirmation instructions have been sent to %(email)s." | ||
msgstr "" | ||
"ご登録ありがとうございます。%(email)sにメール アドレス検証手順が送信されま" | ||
"した。" | ||
|
||
#: flask_security/core.py:138 | ||
msgid "Thank you. Your email has been confirmed." | ||
msgstr "ありがとうございます。メール アドレスが検証されました。" | ||
|
||
#: flask_security/core.py:140 | ||
msgid "Your email has already been confirmed." | ||
msgstr "メール アドレスは検証済みです" | ||
|
||
#: flask_security/core.py:142 | ||
msgid "Invalid confirmation token." | ||
msgstr "リンクが無効です" | ||
|
||
#: flask_security/core.py:144 | ||
#, python-format | ||
msgid "%(email)s is already associated with an account." | ||
msgstr "%(email)s のアカウントは既に作成されています" | ||
|
||
#: flask_security/core.py:146 | ||
msgid "Password does not match" | ||
msgstr "パスワードが一致しません" | ||
|
||
#: flask_security/core.py:148 | ||
msgid "Passwords do not match" | ||
msgstr "入力したパスワードが一致していません" | ||
|
||
#: flask_security/core.py:150 | ||
msgid "Redirections outside the domain are forbidden" | ||
msgstr "ドメイン外へのリダイレクトは禁止されています" | ||
|
||
#: flask_security/core.py:152 | ||
#, python-format | ||
msgid "Instructions to reset your password have been sent to %(email)s." | ||
msgstr "パスワードの再設定手順が %(email)s に送信されました" | ||
|
||
#: flask_security/core.py:155 | ||
#, python-format | ||
msgid "" | ||
"You did not reset your password within %(within)s. New instructions have " | ||
"been sent to %(email)s." | ||
msgstr "" | ||
"%(within)s以内にパスワードを設定しませんでした。パスワード再設定手順を " | ||
"%(email)s に再度送信しました。" | ||
|
||
#: flask_security/core.py:158 | ||
msgid "Invalid reset password token." | ||
msgstr "リンクが無効です" | ||
|
||
#: flask_security/core.py:160 | ||
msgid "Email requires confirmation." | ||
msgstr "メール アドレスの検証が必要です" | ||
|
||
#: flask_security/core.py:162 | ||
#, python-format | ||
msgid "Confirmation instructions have been sent to %(email)s." | ||
msgstr "%(email)sにメール アドレス検証手順が再送信されました" | ||
|
||
#: flask_security/core.py:164 | ||
#, python-format | ||
msgid "" | ||
"You did not confirm your email within %(within)s. New instructions to " | ||
"confirm your email have been sent to %(email)s." | ||
msgstr "" | ||
"%(within)s以内にメール アドレスが検証されませんでした。新しい検証手順を " | ||
"%(email)s に送信しました。" | ||
|
||
#: flask_security/core.py:168 | ||
#, python-format | ||
msgid "" | ||
"You did not login within %(within)s. New instructions to login have been " | ||
"sent to %(email)s." | ||
msgstr "" | ||
"%(within)s以内にログインしませんでした。ログイン手順を %(email)s に再度送" | ||
"信しました。" | ||
|
||
#: flask_security/core.py:171 | ||
#, python-format | ||
msgid "Instructions to login have been sent to %(email)s." | ||
msgstr "%(email)sにログイン手順が送信されました" | ||
|
||
#: flask_security/core.py:173 | ||
msgid "Invalid login token." | ||
msgstr "リンクが無効です" | ||
|
||
#: flask_security/core.py:175 | ||
msgid "Account is disabled." | ||
msgstr "アカウントが無効になっています" | ||
|
||
#: flask_security/core.py:177 | ||
msgid "Email not provided" | ||
msgstr "メール アドレスを入力してください" | ||
|
||
#: flask_security/core.py:179 | ||
msgid "Invalid email address" | ||
msgstr "正しいメール アドレスを入力してください" | ||
|
||
#: flask_security/core.py:181 | ||
msgid "Password not provided" | ||
msgstr "パスワードを入力してください" | ||
|
||
#: flask_security/core.py:183 | ||
msgid "No password is set for this user" | ||
msgstr "パスワードが設定されていません" | ||
|
||
#: flask_security/core.py:185 | ||
msgid "Password must be at least 6 characters" | ||
msgstr "パスワードは6文字以上でなければなりません" | ||
|
||
#: flask_security/core.py:187 | ||
msgid "Specified user does not exist" | ||
msgstr "入力を確認してください" | ||
|
||
#: flask_security/core.py:189 | ||
msgid "Invalid password" | ||
msgstr "入力を確認してください" | ||
|
||
#: flask_security/core.py:191 | ||
msgid "You have successfully logged in." | ||
msgstr "ログインしました" | ||
|
||
#: flask_security/core.py:193 | ||
msgid "Forgot password?" | ||
msgstr "パスワードを忘れた場合" | ||
|
||
#: flask_security/core.py:195 | ||
msgid "" | ||
"You successfully reset your password and you have been logged in " | ||
"automatically." | ||
msgstr "パスワードの再設定が完了しました。" | ||
|
||
#: flask_security/core.py:198 | ||
msgid "Your new password must be different than your previous password." | ||
msgstr "新旧パスワードが同じです" | ||
|
||
#: flask_security/core.py:201 | ||
msgid "You successfully changed your password." | ||
msgstr "パスワードが変更されました" | ||
|
||
#: flask_security/core.py:203 | ||
msgid "Please log in to access this page." | ||
msgstr "ログインしてください" | ||
|
||
#: flask_security/core.py:205 | ||
msgid "Please reauthenticate to access this page." | ||
msgstr "再度ログインしてください" | ||
|
||
#: flask_security/forms.py:30 | ||
msgid "Email Address" | ||
msgstr "メール アドレス" | ||
|
||
#: flask_security/forms.py:31 | ||
msgid "Password" | ||
msgstr "パスワード" | ||
|
||
#: flask_security/forms.py:32 | ||
msgid "Remember Me" | ||
msgstr "次回以降ログインを省略する" | ||
|
||
#: flask_security/forms.py:33 flask_security/templates/security/_menu.html:4 | ||
#: flask_security/templates/security/login_user.html:3 | ||
#: flask_security/templates/security/send_login.html:3 | ||
msgid "Login" | ||
msgstr "ログイン" | ||
|
||
#: flask_security/forms.py:34 flask_security/templates/security/_menu.html:6 | ||
#: flask_security/templates/security/register_user.html:3 | ||
msgid "Register" | ||
msgstr "ユーザ登録" | ||
|
||
#: flask_security/forms.py:35 | ||
msgid "Resend Confirmation Instructions" | ||
msgstr "検証手順の再送信" | ||
|
||
#: flask_security/forms.py:36 | ||
msgid "Recover Password" | ||
msgstr "再設定手順を送信" | ||
|
||
#: flask_security/forms.py:37 | ||
msgid "Reset Password" | ||
msgstr "パスワード変更" | ||
|
||
#: flask_security/forms.py:38 | ||
msgid "Retype Password" | ||
msgstr "パスワード再入力" | ||
|
||
#: flask_security/forms.py:39 | ||
msgid "New Password" | ||
msgstr "新しいパスワード" | ||
|
||
#: flask_security/forms.py:40 | ||
msgid "Change Password" | ||
msgstr "変更" | ||
|
||
#: flask_security/forms.py:41 | ||
msgid "Send Login Link" | ||
msgstr "ログイン手順を送信" | ||
|
||
#: flask_security/templates/security/_menu.html:2 | ||
msgid "Menu" | ||
msgstr "メニュー" | ||
|
||
#: flask_security/templates/security/_menu.html:9 | ||
msgid "Forgot password" | ||
msgstr "パスワードを忘れた場合" | ||
|
||
#: flask_security/templates/security/_menu.html:12 | ||
msgid "Confirm account" | ||
msgstr "メール アドレスの検証" | ||
|
||
#: flask_security/templates/security/change_password.html:3 | ||
msgid "Change password" | ||
msgstr "パスワードの変更" | ||
|
||
#: flask_security/templates/security/forgot_password.html:3 | ||
msgid "Send password reset instructions" | ||
msgstr "パスワード再設定手順の送信" | ||
|
||
#: flask_security/templates/security/reset_password.html:3 | ||
msgid "Reset password" | ||
msgstr "パスワード再設定" | ||
|
||
#: flask_security/templates/security/send_confirmation.html:3 | ||
msgid "Resend confirmation instructions" | ||
msgstr "検証手順の再送信" | ||
|
||
#: flask_security/templates/security/email/change_notice.html:1 | ||
msgid "Your password has been changed." | ||
msgstr "パスワードが変更されました。" | ||
|
||
#: flask_security/templates/security/email/change_notice.html:3 | ||
msgid "If you did not change your password," | ||
msgstr "パスワードを変更した覚えがない場合には、" | ||
|
||
#: flask_security/templates/security/email/change_notice.html:3 | ||
msgid "click here to reset it" | ||
msgstr "このリンクを開いてください。" | ||
|
||
#: flask_security/templates/security/email/confirmation_instructions.html:1 | ||
msgid "Please confirm your email through the link below:" | ||
msgstr "以下のリンクからメール アドレスを検証してください:" | ||
|
||
#: flask_security/templates/security/email/confirmation_instructions.html:3 | ||
#: flask_security/templates/security/email/welcome.html:6 | ||
msgid "Confirm my account" | ||
msgstr "メール アドレスの検証" | ||
|
||
#: flask_security/templates/security/email/login_instructions.html:1 | ||
#: flask_security/templates/security/email/welcome.html:1 | ||
#, python-format | ||
msgid "Welcome %(email)s!" | ||
msgstr "ようこそ %(email)s !" | ||
|
||
#: flask_security/templates/security/email/login_instructions.html:3 | ||
msgid "You can log into your account through the link below:" | ||
msgstr "以下のリンクによりログインできます。" | ||
|
||
#: flask_security/templates/security/email/login_instructions.html:5 | ||
msgid "Login now" | ||
msgstr "ログイン" | ||
|
||
#: flask_security/templates/security/email/reset_instructions.html:1 | ||
msgid "Click here to reset your password" | ||
msgstr "パスワードを再設定するためにこのリンクを開いてください。" | ||
|
||
#: flask_security/templates/security/email/welcome.html:4 | ||
msgid "You can confirm your email through the link below:" | ||
msgstr "以下のリンクによりメール アドレスを検証できます。" |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@kantorii can you please clarify why do we need to move the
do_flash
call to the separate block?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes. If there is an exception within user_registered.send(), do_flash() will not be executed.
I believe it should be that way, because, if I remember correctly, the flash says an email was sent.