From 456f1673c1d2fd684c7f00df6d5f76211bd3da0b Mon Sep 17 00:00:00 2001 From: ito Date: Thu, 25 Apr 2013 04:54:07 +0000 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BB=96=E3=83=86=E3=83=BC=E3=83=96?= =?UTF-8?q?=E3=83=AB=E5=AF=BE=E5=BF=9C=E3=80=81=20=E6=97=A5=E6=9C=AC?= =?UTF-8?q?=E8=AA=9E=E5=8C=96=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Config/bootstrap.php | 4 + Locale/default.pot | 24 ++ Locale/jpn/LC_MESSAGES/users.po | 584 ++++++++++++++++++++++++++++++++ 3 files changed, 612 insertions(+) create mode 100644 Config/bootstrap.php create mode 100644 Locale/default.pot create mode 100644 Locale/jpn/LC_MESSAGES/users.po diff --git a/Config/bootstrap.php b/Config/bootstrap.php new file mode 100644 index 000000000..de847479d --- /dev/null +++ b/Config/bootstrap.php @@ -0,0 +1,4 @@ + +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PROJECT VERSION\n" +"POT-Creation-Date: 2013-04-11 11:43+0200\n" +"PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n" +"Last-Translator: NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" + +#: View/Elements/pagination.ctp:14 +msgid "previous" +msgstr "" + +#: View/Elements/pagination.ctp:16 +msgid "next" +msgstr "" + diff --git a/Locale/jpn/LC_MESSAGES/users.po b/Locale/jpn/LC_MESSAGES/users.po new file mode 100644 index 000000000..f0516eff7 --- /dev/null +++ b/Locale/jpn/LC_MESSAGES/users.po @@ -0,0 +1,584 @@ +# LANGUAGE translation of CakePHP Application +# Copyright YEAR NAME +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PROJECT VERSION\n" +"POT-Creation-Date: 2013-04-11 11:43+0200\n" +"PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n" +"Last-Translator: NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" + +#: Controller/UserDetailsController.php:59;147 +msgid "Invalid Detail." +msgstr "" + +#: Controller/UserDetailsController.php:81 +msgid "Saved" +msgstr "" + +#: Controller/UserDetailsController.php:101 +msgid "%s details saved" +msgstr "" + +#: Controller/UserDetailsController.php:120;208 +msgid "Invalid id for Detail" +msgstr "" + +#: Controller/UserDetailsController.php:124;212 +msgid "User Detail deleted" +msgstr "" + +#: Controller/UserDetailsController.php:162;186 +msgid "The Detail has been saved" +msgstr "" + +#: Controller/UserDetailsController.php:165;189 +msgid "The Detail could not be saved. Please, try again." +msgstr "" + +#: Controller/UserDetailsController.php:181 +msgid "Invalid Detail" +msgstr "" + +#: Controller/UsersController.php:201 +msgid "Profile saved." +msgstr "" + +#: Controller/UsersController.php:203 +msgid "Could not save your profile." +msgstr "" + +#: Controller/UsersController.php:244 +msgid "Invalid User." +msgstr "" + +#: Controller/UsersController.php:261 +msgid "The User has been saved" +msgstr "" + +#: Controller/UsersController.php:278 +msgid "User saved" +msgstr "" + +#: Controller/UsersController.php:302 +msgid "User deleted" +msgstr "" + +#: Controller/UsersController.php:304 +#: Model/User.php:833 +msgid "Invalid User" +msgstr "" + +#: Controller/UsersController.php:326 +msgid "You are already registered and logged in!" +msgstr "" + +#: Controller/UsersController.php:334 +#: Test/Case/Controller/UsersControllerTest.php:328 +msgid "Your account has been created. You should receive an e-mail shortly to authenticate your account. Once validated you will be able to login." +msgstr "" + +#: Controller/UsersController.php:339 +#: Test/Case/Controller/UsersControllerTest.php:343 +msgid "Your account could not be created. Please, try again." +msgstr "" + +#: Controller/UsersController.php:358 +msgid "%s you have successfully logged in" +msgstr "" + +#: Controller/UsersController.php:370 +#: Test/Case/Controller/UsersControllerTest.php:302 +msgid "Invalid e-mail / password combination. Please try again" +msgstr "" + +#: Controller/UsersController.php:434 +msgid "%s you have successfully logged out" +msgstr "" + +#: Controller/UsersController.php:453 +#: Test/Case/Controller/UsersControllerTest.php:360 +msgid "Your e-mail has been validated!" +msgstr "" + +#: Controller/UsersController.php:475 +msgid "The url you accessed is not longer valid" +msgstr "" + +#: Controller/UsersController.php:484 +msgid "Your password was sent to your registered email account" +msgstr "" + +#: Controller/UsersController.php:488 +msgid "There was an error verifying your account. Please check the email you were sent, and retry the verification link." +msgstr "" + +#: Controller/UsersController.php:504;608 +msgid "Password Reset" +msgstr "" + +#: Controller/UsersController.php:521 +msgid "Password changed." +msgstr "" + +#: Controller/UsersController.php:580 +msgid "Account verification" +msgstr "" + +#: Controller/UsersController.php:632 +msgid "%s has been sent an email with instruction to reset their password." +msgstr "" + +#: Controller/UsersController.php:636 +msgid "You should receive an email with further instructions shortly" +msgstr "" + +#: Controller/UsersController.php:640 +msgid "No user was found with that email." +msgstr "" + +#: Controller/UsersController.php:687 +msgid "Invalid password reset token, try again." +msgstr "" + +#: Controller/UsersController.php:692 +msgid "Password changed, you can now login with your new password." +msgstr "" + +#: Model/User.php:158;448 +msgid "The passwords are not equal." +msgstr "" + +#: Model/User.php:160 +msgid "Invalid password." +msgstr "" + +#: Model/User.php:189;192;195 +msgid "Invalid date" +msgstr "" + +#: Model/User.php:302 +#: Test/Case/Controller/UsersControllerTest.php:368 +msgid "Invalid token, please check the email you were sent, and retry the verification link." +msgstr "" + +#: Model/User.php:307 +msgid "The token has expired." +msgstr "" + +#: Model/User.php:406 +msgid "This Email Address exists but was never validated." +msgstr "" + +#: Model/User.php:408 +msgid "This Email Address does not exist in the system." +msgstr "" + +#: Model/User.php:492 +msgid "$this->data['" +msgstr "" + +#: Model/User.php:536 +msgid "The user does not exist." +msgstr "" + +#: Model/User.php:593 +msgid "Please enter your email address." +msgstr "" + +#: Model/User.php:603 +msgid "The email address does not exist in the system" +msgstr "" + +#: Model/User.php:608 +msgid "Your account is already authenticaed." +msgstr "" + +#: Model/User.php:613 +msgid "Your account is disabled." +msgstr "" + +#: Test/Case/Controller/UsersControllerTest.php:54 +msgid "Sorry, but you need to login to access this location." +msgstr "" + +#: Test/Case/Controller/UsersControllerTest.php:265 +msgid "adminuser you have successfully logged in" +msgstr "" + +#: Test/Case/Controller/UsersControllerTest.php:387 +msgid "testuser you have successfully logged out" +msgstr "" + +#: View/Elements/Users/admin_sidebar.ctp:3 +msgid "Logout" +msgstr "" + +#: View/Elements/Users/admin_sidebar.ctp:4 +msgid "My Account" +msgstr "" + +#: View/Elements/Users/admin_sidebar.ctp:6 +msgid "Add Users" +msgstr "新規登録" + +#: View/Elements/Users/admin_sidebar.ctp:7 +#: View/UserDetails/add.ctp:28 +#: View/UserDetails/admin_add.ctp:28 +#: View/UserDetails/admin_edit.ctp:30 +#: View/UserDetails/admin_index.ctp:73 +#: View/UserDetails/admin_view.ctp:58 +#: View/UserDetails/view.ctp:59 +msgid "List Users" +msgstr "" + +#: View/Elements/Users/admin_sidebar.ctp:9 +msgid "Frontend" +msgstr "" + +#: View/Elements/Users/sidebar.ctp:4 +#: View/Users/login.ctp:13 +msgid "Login" +msgstr "ログイン" + +#: View/Elements/Users/sidebar.ctp:6 +msgid "Register an account" +msgstr "新規登録" + +#: View/Emails/text/account_verification.ctp:12 +msgid "Hello %s," +msgstr "" + +#: View/Emails/text/account_verification.ctp:14 +msgid "to validate your account, you must visit the URL below within 24 hours" +msgstr "" + +#: View/Emails/text/new_password.ctp:12 +msgid "Your password has been reset" +msgstr "" + +#: View/Emails/text/new_password.ctp:13 +msgid "Please login using this password and change your password" +msgstr "" + +#: View/Emails/text/new_password.ctp:15 +msgid "Your new password is: %s" +msgstr "" + +#: View/Emails/text/password_reset_request.ctp:12 +msgid "A request to reset your password was sent. To change your password click the link below." +msgstr "" + +#: View/UserDetails/add.ctp:15 +#: View/UserDetails/admin_add.ctp:15 +msgid "Add User Detail" +msgstr "" + +#: View/UserDetails/add.ctp:23 +#: View/UserDetails/admin_add.ctp:23 +#: View/UserDetails/index.ctp:27 +#: View/Users/add.ctp:32 +#: View/Users/change_password.ctp:26 +#: View/Users/edit.ctp:25 +#: View/Users/login.ctp:29 +#: View/Users/request_password_change.ctp:22 +#: View/Users/reset_password.ctp:14 +msgid "Submit" +msgstr "" + +#: View/UserDetails/add.ctp:27 +#: View/UserDetails/admin_add.ctp:27 +#: View/UserDetails/admin_edit.ctp:29 +#: View/UserDetails/admin_view.ctp:56 +#: View/UserDetails/view.ctp:57 +msgid "List Details" +msgstr "" + +#: View/UserDetails/add.ctp:29 +#: View/UserDetails/admin_add.ctp:29 +#: View/UserDetails/admin_edit.ctp:31 +#: View/UserDetails/admin_index.ctp:74 +#: View/UserDetails/admin_view.ctp:59 +#: View/UserDetails/view.ctp:60 +msgid "New User" +msgstr "" + +#: View/UserDetails/admin_edit.ctp:15 +#: View/UserDetails/edit.ctp:15 +msgid "Edit User Detail" +msgstr "" + +#: View/UserDetails/admin_edit.ctp:28 +#: View/UserDetails/admin_index.ctp:63 +#: View/Users/admin_index.ctp:60 +#: View/Users/search.ctp:52 +msgid "Delete" +msgstr "" + +#: View/UserDetails/admin_edit.ctp:28 +#: View/UserDetails/admin_index.ctp:63 +#: View/UserDetails/admin_view.ctp:55 +#: View/UserDetails/view.ctp:56 +#: View/Users/admin_index.ctp:60 +#: View/Users/search.ctp:55 +msgid "Are you sure you want to delete # %s?" +msgstr "" + +#: View/UserDetails/admin_index.ctp:13 +msgid "User Details" +msgstr "" + +#: View/UserDetails/admin_index.ctp:16 +#: View/Users/index.ctp:17 +#: View/Users/search.ctp:27 +msgid "Page %page% of %pages%, showing %current% records out of %count% total, starting on record %start%, ending on %end%" +msgstr "" + +#: View/UserDetails/admin_index.ctp:28 +#: View/Users/admin_index.ctp:31 +#: View/Users/index.ctp:25 +#: View/Users/search.ctp:35 +msgid "Actions" +msgstr "" + +#: View/UserDetails/admin_index.ctp:61 +#: View/Users/admin_index.ctp:58 +#: View/Users/index.ctp:39 +#: View/Users/search.ctp:49 +msgid "View" +msgstr "" + +#: View/UserDetails/admin_index.ctp:62 +#: View/Users/admin_index.ctp:59 +#: View/Users/search.ctp:50 +msgid "Edit" +msgstr "" + +#: View/UserDetails/admin_index.ctp:72 +msgid "New User Detail" +msgstr "" + +#: View/UserDetails/admin_view.ctp:13 +#: View/UserDetails/view.ctp:13 +msgid "User Detail" +msgstr "" + +#: View/UserDetails/admin_view.ctp:15 +#: View/UserDetails/view.ctp:15 +msgid "Id" +msgstr "" + +#: View/UserDetails/admin_view.ctp:20 +#: View/UserDetails/view.ctp:20 +#: View/Users/admin_view.ctp:13 +#: View/Users/view.ctp:13 +msgid "User" +msgstr "" + +#: View/UserDetails/admin_view.ctp:25 +#: View/UserDetails/view.ctp:25 +msgid "Position" +msgstr "" + +#: View/UserDetails/admin_view.ctp:30 +#: View/UserDetails/view.ctp:30 +msgid "Field" +msgstr "" + +#: View/UserDetails/admin_view.ctp:35 +#: View/UserDetails/view.ctp:35 +msgid "Value" +msgstr "" + +#: View/UserDetails/admin_view.ctp:40 +#: View/UserDetails/view.ctp:40 +#: View/Users/admin_view.ctp:20 +#: View/Users/view.ctp:20 +msgid "Created" +msgstr "" + +#: View/UserDetails/admin_view.ctp:45 +#: View/UserDetails/view.ctp:45 +#: View/Users/admin_view.ctp:25 +msgid "Modified" +msgstr "" + +#: View/UserDetails/admin_view.ctp:54 +#: View/UserDetails/view.ctp:55 +msgid "Edit Detail" +msgstr "" + +#: View/UserDetails/admin_view.ctp:55 +#: View/UserDetails/view.ctp:56 +msgid "Delete Detail" +msgstr "" + +#: View/UserDetails/admin_view.ctp:57 +#: View/UserDetails/view.ctp:58 +msgid "New Detail" +msgstr "" + +#: View/Users/add.ctp:13 +#: View/Users/admin_add.ctp:15 +msgid "Add User" +msgstr "新規登録" + +#: View/Users/add.ctp:18 +#: View/Users/admin_add.ctp:18 +#: View/Users/admin_edit.ctp:19 +#: View/Users/admin_index.ctp:18 +#: View/Users/admin_view.ctp:15 +#: View/Users/search.ctp:18 +#: View/Users/view.ctp:15 +msgid "Username" +msgstr "" + +#: View/Users/add.ctp:20 +#: View/Users/admin_add.ctp:20 +msgid "E-mail (used as login)" +msgstr "" + +#: View/Users/add.ctp:21 +#: View/Users/admin_add.ctp:21 +msgid "Must be a valid email address" +msgstr "" + +#: View/Users/add.ctp:22 +#: View/Users/admin_add.ctp:22 +msgid "An account with that email already exists" +msgstr "" + +#: View/Users/add.ctp:24 +#: View/Users/admin_add.ctp:24 +#: View/Users/login.ctp:22 +msgid "Password" +msgstr "" + +#: View/Users/add.ctp:27 +#: View/Users/admin_add.ctp:27 +msgid "Password (confirm)" +msgstr "" + +#: View/Users/add.ctp:29 +msgid "Terms of Service" +msgstr "" + +#: View/Users/add.ctp:31 +msgid "I have read and agreed to " +msgstr "" + +#: View/Users/admin_add.ctp:31 +#: View/Users/admin_edit.ctp:24 +msgid "Role" +msgstr "" + +#: View/Users/admin_add.ctp:35 +#: View/Users/admin_edit.ctp:27 +msgid "Is Admin" +msgstr "" + +#: View/Users/admin_add.ctp:37 +#: View/Users/admin_edit.ctp:29 +msgid "Active" +msgstr "" + +#: View/Users/admin_edit.ctp:15 +#: View/Users/edit.ctp:15 +msgid "Edit User" +msgstr "" + +#: View/Users/admin_edit.ctp:21 +#: View/Users/admin_index.ctp:19 +#: View/Users/login.ctp:20 +#: View/Users/search.ctp:20 +msgid "Email" +msgstr "" + +#: View/Users/admin_index.ctp:13 +#: View/Users/index.ctp:13 +#: View/Users/search.ctp:13 +msgid "Users" +msgstr "" + +#: View/Users/admin_index.ctp:15 +msgid "Filter" +msgstr "" + +#: View/Users/admin_index.ctp:20 +#: View/Users/search.ctp:23 +msgid "Search" +msgstr "" + +#: View/Users/admin_index.ctp:49;52 +msgid "Yes" +msgstr "" + +#: View/Users/admin_index.ctp:49;52 +msgid "No" +msgstr "" + +#: View/Users/change_password.ctp:13 +#: View/Users/edit.ctp:22 +msgid "Change your password" +msgstr "" + +#: View/Users/change_password.ctp:14 +msgid "Please enter your old password because of security reasons and then your new password twice." +msgstr "" + +#: View/Users/change_password.ctp:18 +msgid "Old Password" +msgstr "" + +#: View/Users/change_password.ctp:21 +#: View/Users/reset_password.ctp:9 +msgid "New Password" +msgstr "" + +#: View/Users/change_password.ctp:24 +#: View/Users/reset_password.ctp:12 +msgid "Confirm" +msgstr "" + +#: View/Users/dashboard.ctp:13 +msgid "Welcome" +msgstr "" + +#: View/Users/dashboard.ctp:14 +msgid "Recent broadcasts" +msgstr "" + +#: View/Users/login.ctp:24 +msgid "Remember Me" +msgstr "" + +#: View/Users/login.ctp:25 +msgid "I forgot my password" +msgstr "" + +#: View/Users/request_password_change.ctp:13 +msgid "Forgot your password?" +msgstr "" + +#: View/Users/request_password_change.ctp:14 +msgid "Please enter the email you used for registration and you'll get an email with further instructions." +msgstr "" + +#: View/Users/request_password_change.ctp:21 +msgid "Your Email" +msgstr "" + +#: View/Users/reset_password.ctp:2 +msgid "Reset your password" +msgstr "" + +#: View/Users/search.ctp:22 +msgid "Name" +msgstr "" + From 5844c2f136f5ca1a437ed82226d703193da77895 Mon Sep 17 00:00:00 2001 From: ito Date: Thu, 25 Apr 2013 04:54:07 +0000 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BB=96=E3=83=86=E3=83=BC=E3=83=96?= =?UTF-8?q?=E3=83=AB=E5=AF=BE=E5=BF=9C=E3=80=81=20=E6=97=A5=E6=9C=AC?= =?UTF-8?q?=E8=AA=9E=E5=8C=96=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Config/bootstrap.php | 4 + Locale/default.pot | 24 ++ Locale/jpn/LC_MESSAGES/users.po | 584 ++++++++++++++++++++++++++++++++ Model/User.php | 14 + 4 files changed, 626 insertions(+) create mode 100644 Config/bootstrap.php create mode 100644 Locale/default.pot create mode 100644 Locale/jpn/LC_MESSAGES/users.po diff --git a/Config/bootstrap.php b/Config/bootstrap.php new file mode 100644 index 000000000..de847479d --- /dev/null +++ b/Config/bootstrap.php @@ -0,0 +1,4 @@ + +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PROJECT VERSION\n" +"POT-Creation-Date: 2013-04-11 11:43+0200\n" +"PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n" +"Last-Translator: NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" + +#: View/Elements/pagination.ctp:14 +msgid "previous" +msgstr "" + +#: View/Elements/pagination.ctp:16 +msgid "next" +msgstr "" + diff --git a/Locale/jpn/LC_MESSAGES/users.po b/Locale/jpn/LC_MESSAGES/users.po new file mode 100644 index 000000000..f0516eff7 --- /dev/null +++ b/Locale/jpn/LC_MESSAGES/users.po @@ -0,0 +1,584 @@ +# LANGUAGE translation of CakePHP Application +# Copyright YEAR NAME +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PROJECT VERSION\n" +"POT-Creation-Date: 2013-04-11 11:43+0200\n" +"PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n" +"Last-Translator: NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" + +#: Controller/UserDetailsController.php:59;147 +msgid "Invalid Detail." +msgstr "" + +#: Controller/UserDetailsController.php:81 +msgid "Saved" +msgstr "" + +#: Controller/UserDetailsController.php:101 +msgid "%s details saved" +msgstr "" + +#: Controller/UserDetailsController.php:120;208 +msgid "Invalid id for Detail" +msgstr "" + +#: Controller/UserDetailsController.php:124;212 +msgid "User Detail deleted" +msgstr "" + +#: Controller/UserDetailsController.php:162;186 +msgid "The Detail has been saved" +msgstr "" + +#: Controller/UserDetailsController.php:165;189 +msgid "The Detail could not be saved. Please, try again." +msgstr "" + +#: Controller/UserDetailsController.php:181 +msgid "Invalid Detail" +msgstr "" + +#: Controller/UsersController.php:201 +msgid "Profile saved." +msgstr "" + +#: Controller/UsersController.php:203 +msgid "Could not save your profile." +msgstr "" + +#: Controller/UsersController.php:244 +msgid "Invalid User." +msgstr "" + +#: Controller/UsersController.php:261 +msgid "The User has been saved" +msgstr "" + +#: Controller/UsersController.php:278 +msgid "User saved" +msgstr "" + +#: Controller/UsersController.php:302 +msgid "User deleted" +msgstr "" + +#: Controller/UsersController.php:304 +#: Model/User.php:833 +msgid "Invalid User" +msgstr "" + +#: Controller/UsersController.php:326 +msgid "You are already registered and logged in!" +msgstr "" + +#: Controller/UsersController.php:334 +#: Test/Case/Controller/UsersControllerTest.php:328 +msgid "Your account has been created. You should receive an e-mail shortly to authenticate your account. Once validated you will be able to login." +msgstr "" + +#: Controller/UsersController.php:339 +#: Test/Case/Controller/UsersControllerTest.php:343 +msgid "Your account could not be created. Please, try again." +msgstr "" + +#: Controller/UsersController.php:358 +msgid "%s you have successfully logged in" +msgstr "" + +#: Controller/UsersController.php:370 +#: Test/Case/Controller/UsersControllerTest.php:302 +msgid "Invalid e-mail / password combination. Please try again" +msgstr "" + +#: Controller/UsersController.php:434 +msgid "%s you have successfully logged out" +msgstr "" + +#: Controller/UsersController.php:453 +#: Test/Case/Controller/UsersControllerTest.php:360 +msgid "Your e-mail has been validated!" +msgstr "" + +#: Controller/UsersController.php:475 +msgid "The url you accessed is not longer valid" +msgstr "" + +#: Controller/UsersController.php:484 +msgid "Your password was sent to your registered email account" +msgstr "" + +#: Controller/UsersController.php:488 +msgid "There was an error verifying your account. Please check the email you were sent, and retry the verification link." +msgstr "" + +#: Controller/UsersController.php:504;608 +msgid "Password Reset" +msgstr "" + +#: Controller/UsersController.php:521 +msgid "Password changed." +msgstr "" + +#: Controller/UsersController.php:580 +msgid "Account verification" +msgstr "" + +#: Controller/UsersController.php:632 +msgid "%s has been sent an email with instruction to reset their password." +msgstr "" + +#: Controller/UsersController.php:636 +msgid "You should receive an email with further instructions shortly" +msgstr "" + +#: Controller/UsersController.php:640 +msgid "No user was found with that email." +msgstr "" + +#: Controller/UsersController.php:687 +msgid "Invalid password reset token, try again." +msgstr "" + +#: Controller/UsersController.php:692 +msgid "Password changed, you can now login with your new password." +msgstr "" + +#: Model/User.php:158;448 +msgid "The passwords are not equal." +msgstr "" + +#: Model/User.php:160 +msgid "Invalid password." +msgstr "" + +#: Model/User.php:189;192;195 +msgid "Invalid date" +msgstr "" + +#: Model/User.php:302 +#: Test/Case/Controller/UsersControllerTest.php:368 +msgid "Invalid token, please check the email you were sent, and retry the verification link." +msgstr "" + +#: Model/User.php:307 +msgid "The token has expired." +msgstr "" + +#: Model/User.php:406 +msgid "This Email Address exists but was never validated." +msgstr "" + +#: Model/User.php:408 +msgid "This Email Address does not exist in the system." +msgstr "" + +#: Model/User.php:492 +msgid "$this->data['" +msgstr "" + +#: Model/User.php:536 +msgid "The user does not exist." +msgstr "" + +#: Model/User.php:593 +msgid "Please enter your email address." +msgstr "" + +#: Model/User.php:603 +msgid "The email address does not exist in the system" +msgstr "" + +#: Model/User.php:608 +msgid "Your account is already authenticaed." +msgstr "" + +#: Model/User.php:613 +msgid "Your account is disabled." +msgstr "" + +#: Test/Case/Controller/UsersControllerTest.php:54 +msgid "Sorry, but you need to login to access this location." +msgstr "" + +#: Test/Case/Controller/UsersControllerTest.php:265 +msgid "adminuser you have successfully logged in" +msgstr "" + +#: Test/Case/Controller/UsersControllerTest.php:387 +msgid "testuser you have successfully logged out" +msgstr "" + +#: View/Elements/Users/admin_sidebar.ctp:3 +msgid "Logout" +msgstr "" + +#: View/Elements/Users/admin_sidebar.ctp:4 +msgid "My Account" +msgstr "" + +#: View/Elements/Users/admin_sidebar.ctp:6 +msgid "Add Users" +msgstr "新規登録" + +#: View/Elements/Users/admin_sidebar.ctp:7 +#: View/UserDetails/add.ctp:28 +#: View/UserDetails/admin_add.ctp:28 +#: View/UserDetails/admin_edit.ctp:30 +#: View/UserDetails/admin_index.ctp:73 +#: View/UserDetails/admin_view.ctp:58 +#: View/UserDetails/view.ctp:59 +msgid "List Users" +msgstr "" + +#: View/Elements/Users/admin_sidebar.ctp:9 +msgid "Frontend" +msgstr "" + +#: View/Elements/Users/sidebar.ctp:4 +#: View/Users/login.ctp:13 +msgid "Login" +msgstr "ログイン" + +#: View/Elements/Users/sidebar.ctp:6 +msgid "Register an account" +msgstr "新規登録" + +#: View/Emails/text/account_verification.ctp:12 +msgid "Hello %s," +msgstr "" + +#: View/Emails/text/account_verification.ctp:14 +msgid "to validate your account, you must visit the URL below within 24 hours" +msgstr "" + +#: View/Emails/text/new_password.ctp:12 +msgid "Your password has been reset" +msgstr "" + +#: View/Emails/text/new_password.ctp:13 +msgid "Please login using this password and change your password" +msgstr "" + +#: View/Emails/text/new_password.ctp:15 +msgid "Your new password is: %s" +msgstr "" + +#: View/Emails/text/password_reset_request.ctp:12 +msgid "A request to reset your password was sent. To change your password click the link below." +msgstr "" + +#: View/UserDetails/add.ctp:15 +#: View/UserDetails/admin_add.ctp:15 +msgid "Add User Detail" +msgstr "" + +#: View/UserDetails/add.ctp:23 +#: View/UserDetails/admin_add.ctp:23 +#: View/UserDetails/index.ctp:27 +#: View/Users/add.ctp:32 +#: View/Users/change_password.ctp:26 +#: View/Users/edit.ctp:25 +#: View/Users/login.ctp:29 +#: View/Users/request_password_change.ctp:22 +#: View/Users/reset_password.ctp:14 +msgid "Submit" +msgstr "" + +#: View/UserDetails/add.ctp:27 +#: View/UserDetails/admin_add.ctp:27 +#: View/UserDetails/admin_edit.ctp:29 +#: View/UserDetails/admin_view.ctp:56 +#: View/UserDetails/view.ctp:57 +msgid "List Details" +msgstr "" + +#: View/UserDetails/add.ctp:29 +#: View/UserDetails/admin_add.ctp:29 +#: View/UserDetails/admin_edit.ctp:31 +#: View/UserDetails/admin_index.ctp:74 +#: View/UserDetails/admin_view.ctp:59 +#: View/UserDetails/view.ctp:60 +msgid "New User" +msgstr "" + +#: View/UserDetails/admin_edit.ctp:15 +#: View/UserDetails/edit.ctp:15 +msgid "Edit User Detail" +msgstr "" + +#: View/UserDetails/admin_edit.ctp:28 +#: View/UserDetails/admin_index.ctp:63 +#: View/Users/admin_index.ctp:60 +#: View/Users/search.ctp:52 +msgid "Delete" +msgstr "" + +#: View/UserDetails/admin_edit.ctp:28 +#: View/UserDetails/admin_index.ctp:63 +#: View/UserDetails/admin_view.ctp:55 +#: View/UserDetails/view.ctp:56 +#: View/Users/admin_index.ctp:60 +#: View/Users/search.ctp:55 +msgid "Are you sure you want to delete # %s?" +msgstr "" + +#: View/UserDetails/admin_index.ctp:13 +msgid "User Details" +msgstr "" + +#: View/UserDetails/admin_index.ctp:16 +#: View/Users/index.ctp:17 +#: View/Users/search.ctp:27 +msgid "Page %page% of %pages%, showing %current% records out of %count% total, starting on record %start%, ending on %end%" +msgstr "" + +#: View/UserDetails/admin_index.ctp:28 +#: View/Users/admin_index.ctp:31 +#: View/Users/index.ctp:25 +#: View/Users/search.ctp:35 +msgid "Actions" +msgstr "" + +#: View/UserDetails/admin_index.ctp:61 +#: View/Users/admin_index.ctp:58 +#: View/Users/index.ctp:39 +#: View/Users/search.ctp:49 +msgid "View" +msgstr "" + +#: View/UserDetails/admin_index.ctp:62 +#: View/Users/admin_index.ctp:59 +#: View/Users/search.ctp:50 +msgid "Edit" +msgstr "" + +#: View/UserDetails/admin_index.ctp:72 +msgid "New User Detail" +msgstr "" + +#: View/UserDetails/admin_view.ctp:13 +#: View/UserDetails/view.ctp:13 +msgid "User Detail" +msgstr "" + +#: View/UserDetails/admin_view.ctp:15 +#: View/UserDetails/view.ctp:15 +msgid "Id" +msgstr "" + +#: View/UserDetails/admin_view.ctp:20 +#: View/UserDetails/view.ctp:20 +#: View/Users/admin_view.ctp:13 +#: View/Users/view.ctp:13 +msgid "User" +msgstr "" + +#: View/UserDetails/admin_view.ctp:25 +#: View/UserDetails/view.ctp:25 +msgid "Position" +msgstr "" + +#: View/UserDetails/admin_view.ctp:30 +#: View/UserDetails/view.ctp:30 +msgid "Field" +msgstr "" + +#: View/UserDetails/admin_view.ctp:35 +#: View/UserDetails/view.ctp:35 +msgid "Value" +msgstr "" + +#: View/UserDetails/admin_view.ctp:40 +#: View/UserDetails/view.ctp:40 +#: View/Users/admin_view.ctp:20 +#: View/Users/view.ctp:20 +msgid "Created" +msgstr "" + +#: View/UserDetails/admin_view.ctp:45 +#: View/UserDetails/view.ctp:45 +#: View/Users/admin_view.ctp:25 +msgid "Modified" +msgstr "" + +#: View/UserDetails/admin_view.ctp:54 +#: View/UserDetails/view.ctp:55 +msgid "Edit Detail" +msgstr "" + +#: View/UserDetails/admin_view.ctp:55 +#: View/UserDetails/view.ctp:56 +msgid "Delete Detail" +msgstr "" + +#: View/UserDetails/admin_view.ctp:57 +#: View/UserDetails/view.ctp:58 +msgid "New Detail" +msgstr "" + +#: View/Users/add.ctp:13 +#: View/Users/admin_add.ctp:15 +msgid "Add User" +msgstr "新規登録" + +#: View/Users/add.ctp:18 +#: View/Users/admin_add.ctp:18 +#: View/Users/admin_edit.ctp:19 +#: View/Users/admin_index.ctp:18 +#: View/Users/admin_view.ctp:15 +#: View/Users/search.ctp:18 +#: View/Users/view.ctp:15 +msgid "Username" +msgstr "" + +#: View/Users/add.ctp:20 +#: View/Users/admin_add.ctp:20 +msgid "E-mail (used as login)" +msgstr "" + +#: View/Users/add.ctp:21 +#: View/Users/admin_add.ctp:21 +msgid "Must be a valid email address" +msgstr "" + +#: View/Users/add.ctp:22 +#: View/Users/admin_add.ctp:22 +msgid "An account with that email already exists" +msgstr "" + +#: View/Users/add.ctp:24 +#: View/Users/admin_add.ctp:24 +#: View/Users/login.ctp:22 +msgid "Password" +msgstr "" + +#: View/Users/add.ctp:27 +#: View/Users/admin_add.ctp:27 +msgid "Password (confirm)" +msgstr "" + +#: View/Users/add.ctp:29 +msgid "Terms of Service" +msgstr "" + +#: View/Users/add.ctp:31 +msgid "I have read and agreed to " +msgstr "" + +#: View/Users/admin_add.ctp:31 +#: View/Users/admin_edit.ctp:24 +msgid "Role" +msgstr "" + +#: View/Users/admin_add.ctp:35 +#: View/Users/admin_edit.ctp:27 +msgid "Is Admin" +msgstr "" + +#: View/Users/admin_add.ctp:37 +#: View/Users/admin_edit.ctp:29 +msgid "Active" +msgstr "" + +#: View/Users/admin_edit.ctp:15 +#: View/Users/edit.ctp:15 +msgid "Edit User" +msgstr "" + +#: View/Users/admin_edit.ctp:21 +#: View/Users/admin_index.ctp:19 +#: View/Users/login.ctp:20 +#: View/Users/search.ctp:20 +msgid "Email" +msgstr "" + +#: View/Users/admin_index.ctp:13 +#: View/Users/index.ctp:13 +#: View/Users/search.ctp:13 +msgid "Users" +msgstr "" + +#: View/Users/admin_index.ctp:15 +msgid "Filter" +msgstr "" + +#: View/Users/admin_index.ctp:20 +#: View/Users/search.ctp:23 +msgid "Search" +msgstr "" + +#: View/Users/admin_index.ctp:49;52 +msgid "Yes" +msgstr "" + +#: View/Users/admin_index.ctp:49;52 +msgid "No" +msgstr "" + +#: View/Users/change_password.ctp:13 +#: View/Users/edit.ctp:22 +msgid "Change your password" +msgstr "" + +#: View/Users/change_password.ctp:14 +msgid "Please enter your old password because of security reasons and then your new password twice." +msgstr "" + +#: View/Users/change_password.ctp:18 +msgid "Old Password" +msgstr "" + +#: View/Users/change_password.ctp:21 +#: View/Users/reset_password.ctp:9 +msgid "New Password" +msgstr "" + +#: View/Users/change_password.ctp:24 +#: View/Users/reset_password.ctp:12 +msgid "Confirm" +msgstr "" + +#: View/Users/dashboard.ctp:13 +msgid "Welcome" +msgstr "" + +#: View/Users/dashboard.ctp:14 +msgid "Recent broadcasts" +msgstr "" + +#: View/Users/login.ctp:24 +msgid "Remember Me" +msgstr "" + +#: View/Users/login.ctp:25 +msgid "I forgot my password" +msgstr "" + +#: View/Users/request_password_change.ctp:13 +msgid "Forgot your password?" +msgstr "" + +#: View/Users/request_password_change.ctp:14 +msgid "Please enter the email you used for registration and you'll get an email with further instructions." +msgstr "" + +#: View/Users/request_password_change.ctp:21 +msgid "Your Email" +msgstr "" + +#: View/Users/reset_password.ctp:2 +msgid "Reset your password" +msgstr "" + +#: View/Users/search.ctp:22 +msgid "Name" +msgstr "" + diff --git a/Model/User.php b/Model/User.php index 197e90b54..9e5be92fe 100644 --- a/Model/User.php +++ b/Model/User.php @@ -27,6 +27,12 @@ class User extends UsersAppModel { */ public $name = 'User'; +/** + * UseTable デフォルトのAuth用テーブル + * @var string + */ +public $useTable = 'users'; + /** * Additional Find methods * @@ -118,6 +124,14 @@ class User extends UsersAppModel { * @param string $ds Datasource */ public function __construct($id = false, $table = null, $ds = null) { + + //認証テーブルがusersテーブル以外に指定されていたらモデルのテーブルを変更する + $authTable = Configure::read('Users.authTable'); + if(isset($authTable) and $authTable != 'users') + { + $this->useTable = $authTable; + } + $this->_setupBehaviors(); $this->_setupValidation(); parent::__construct($id, $table, $ds);