multi_auth 0.1.0 → 0.2.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (34) hide show
  1. data/README +11 -0
  2. data/app/controllers/auth/name_controller.rb +31 -0
  3. data/app/controllers/credentials/email_controller.rb +3 -3
  4. data/app/controllers/credentials/name_controller.rb +93 -0
  5. data/app/controllers/credentials_controller.rb +6 -4
  6. data/app/models/name_credential.rb +63 -0
  7. data/app/models/name_credential_edit_form.rb +40 -0
  8. data/app/models/name_login_form.rb +14 -0
  9. data/app/models/{email_password_edit_form.rb → password_edit_form.rb} +5 -13
  10. data/app/views/auth/name/index.html.erb +89 -0
  11. data/app/views/credentials/index.html.erb +46 -0
  12. data/app/views/credentials/name/delete.html.erb +19 -0
  13. data/app/views/credentials/name/edit_password.html.erb +27 -0
  14. data/app/views/credentials/name/new.html.erb +32 -0
  15. data/config/routes.rb +8 -0
  16. data/db/development.sqlite3 +0 -0
  17. data/db/schema.rb +13 -1
  18. data/db/test.sqlite3 +0 -0
  19. data/generators/multi_auth_migration/templates/migration.rb +13 -0
  20. data/generators/multi_auth_migration/templates/upgrade_migration.rb +19 -0
  21. data/generators/multi_auth_migration/upgrade_multi_auth_tables_generator.rb +11 -0
  22. data/lib/multi_auth.rb +1 -0
  23. data/lib/multi_auth/active_record.rb +1 -0
  24. data/locale/ja/LC_MESSAGES/multi_auth.mo +0 -0
  25. data/po/ja/multi_auth.po +357 -259
  26. data/po/multi_auth.pot +309 -215
  27. data/test/functional/auth/name_controller_test.rb +77 -0
  28. data/test/functional/credentials/email_controller_test.rb +3 -4
  29. data/test/functional/credentials/name_controller_test.rb +292 -0
  30. data/test/unit/name_credential_edit_form_test.rb +151 -0
  31. data/test/unit/name_credential_test.rb +173 -0
  32. data/test/unit/name_login_form_test.rb +68 -0
  33. data/test/unit/{email_password_edit_form_test.rb → password_edit_form_test.rb} +7 -6
  34. metadata +22 -6
data/po/multi_auth.pot CHANGED
@@ -7,10 +7,11 @@
7
7
  msgid ""
8
8
  msgstr ""
9
9
  "Project-Id-Version: multi_auth 1.0.0\n"
10
- "POT-Creation-Date: 2010-01-06 15:47+0900\n"
10
+ "POT-Creation-Date: 2010-08-16 18:38+0900\n"
11
11
  "PO-Revision-Date: 2009-11-08 22:38+0900\n"
12
12
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13
13
  "Language-Team: LANGUAGE <LL@li.org>\n"
14
+ "Language: \n"
14
15
  "MIME-Version: 1.0\n"
15
16
  "Content-Type: text/plain; charset=UTF-8\n"
16
17
  "Content-Transfer-Encoding: 8bit\n"
@@ -23,6 +24,8 @@ msgstr ""
23
24
 
24
25
  #: app/controllers/credentials/email_controller.rb:46
25
26
  #: app/controllers/credentials/email_controller.rb:73
27
+ #: app/controllers/credentials/name_controller.rb:29
28
+ #: app/controllers/credentials/name_controller.rb:51
26
29
  #: app/controllers/credentials/open_id_controller.rb:22
27
30
  #: app/controllers/signup/email_controller.rb:27
28
31
  #: app/controllers/signup/email_controller.rb:39
@@ -32,6 +35,7 @@ msgid "Please confirm your input."
32
35
  msgstr ""
33
36
 
34
37
  #: app/controllers/credentials/email_controller.rb:68
38
+ #: app/controllers/credentials/name_controller.rb:46
35
39
  msgctxt "MultiAuth"
36
40
  msgid "Password was changed."
37
41
  msgstr ""
@@ -57,6 +61,22 @@ msgctxt "MultiAuth"
57
61
  msgid "This email authentication credential has been already activated."
58
62
  msgstr ""
59
63
 
64
+ #: app/controllers/credentials/name_controller.rb:24
65
+ msgctxt "MultiAuth"
66
+ msgid "Name authentication credential was successfully added."
67
+ msgstr ""
68
+
69
+ #: app/controllers/credentials/name_controller.rb:65
70
+ msgctxt "MultiAuth"
71
+ msgid "Name authentication credential was successfully deleted."
72
+ msgstr ""
73
+
74
+ #: app/controllers/credentials/name_controller.rb:77
75
+ #: app/controllers/credentials/name_controller.rb:87
76
+ msgctxt "MultiAuth"
77
+ msgid "It is invalid name authentication credential."
78
+ msgstr ""
79
+
60
80
  #: app/controllers/credentials/open_id_controller.rb:37
61
81
  msgctxt "MultiAuth"
62
82
  msgid "OpenID authentication credential was successfully added."
@@ -78,11 +98,33 @@ msgctxt "MultiAuth"
78
98
  msgid "It is invalid OpenID authentication credential."
79
99
  msgstr ""
80
100
 
101
+ #: app/controllers/signup/email_controller.rb:93
102
+ msgctxt "MultiAuth"
103
+ msgid "It is an invalid activation key."
104
+ msgstr ""
105
+
106
+ #: app/controllers/signup/email_controller.rb:99
107
+ msgctxt "MultiAuth"
108
+ msgid "This email address has been already registered."
109
+ msgstr ""
110
+
111
+ #: app/controllers/signup/open_id_controller.rb:25
112
+ msgctxt "MultiAuth"
113
+ msgid ""
114
+ "Because specified OpenID has already been registered, it is not possible to "
115
+ "use it. "
116
+ msgstr ""
117
+
81
118
  #: app/controllers/auth/email_controller.rb:30
82
119
  msgctxt "MultiAuth"
83
120
  msgid "The email address or the password is wrong."
84
121
  msgstr ""
85
122
 
123
+ #: app/controllers/auth/name_controller.rb:27
124
+ msgctxt "MultiAuth"
125
+ msgid "The name or the password is wrong."
126
+ msgstr ""
127
+
86
128
  #: app/controllers/auth/open_id_controller.rb:24
87
129
  #: app/views/auth/logged_in.html.erb:2
88
130
  msgctxt "MultiAuth"
@@ -94,21 +136,12 @@ msgctxt "MultiAuth"
94
136
  msgid "This OpenID has not been registered yet."
95
137
  msgstr ""
96
138
 
97
- #: app/controllers/signup/email_controller.rb:93
98
- msgctxt "MultiAuth"
99
- msgid "It is an invalid activation key."
100
- msgstr ""
101
-
102
- #: app/controllers/signup/email_controller.rb:99
103
- msgctxt "MultiAuth"
104
- msgid "This email address has been already registered."
139
+ #: app/models/email_login_form.rb:15
140
+ msgid "EmailLoginForm|Email"
105
141
  msgstr ""
106
142
 
107
- #: app/controllers/signup/open_id_controller.rb:25
108
- msgctxt "MultiAuth"
109
- msgid ""
110
- "Because specified OpenID has already been registered, it is not possible to "
111
- "use it. "
143
+ #: app/models/email_login_form.rb:16
144
+ msgid "EmailLoginForm|Password"
112
145
  msgstr ""
113
146
 
114
147
  #: app/models/email_credential_edit_form.rb:21
@@ -127,34 +160,30 @@ msgstr ""
127
160
  msgid "OpenIdLoginForm|Openid url"
128
161
  msgstr ""
129
162
 
130
- #: app/models/activation_mailer.rb:17
131
- msgctxt "MultiAuth"
132
- msgid "User registration"
163
+ #: app/models/name_credential_edit_form.rb:11
164
+ msgid "NameCredentialEditForm|Name"
133
165
  msgstr ""
134
166
 
135
- #: app/models/activation_mailer.rb:30
136
- msgctxt "MultiAuth"
137
- msgid "User registration completed"
167
+ #: app/models/name_credential_edit_form.rb:12
168
+ msgid "NameCredentialEditForm|Password"
138
169
  msgstr ""
139
170
 
140
- #: app/models/activation_mailer.rb:44
141
- msgctxt "MultiAuth"
142
- msgid "Email address registration for authentication"
171
+ #: app/models/name_credential_edit_form.rb:13
172
+ msgid "NameCredentialEditForm|Password confirmation"
143
173
  msgstr ""
144
174
 
145
- #: app/models/activation_mailer.rb:57
146
- msgctxt "MultiAuth"
147
- msgid "Email address registration for authentication completed"
175
+ #: app/models/name_credential.rb:-
176
+ msgid "name credential"
148
177
  msgstr ""
149
178
 
150
- #: app/models/activation_mailer.rb:71
151
- msgctxt "MultiAuth"
152
- msgid "Email address registration for notification"
179
+ #: app/models/name_credential.rb:-
180
+ #: app/views/credentials/name/delete.html.erb:12
181
+ #: app/views/credentials/index.html.erb:99
182
+ msgid "NameCredential|Name"
153
183
  msgstr ""
154
184
 
155
- #: app/models/activation_mailer.rb:84
156
- msgctxt "MultiAuth"
157
- msgid "Email address registration for notification completed"
185
+ #: app/models/name_credential.rb:- app/views/credentials/index.html.erb:98
186
+ msgid "NameCredential|Loggedin at"
158
187
  msgstr ""
159
188
 
160
189
  #: app/models/email_credential.rb:-
@@ -165,11 +194,12 @@ msgstr ""
165
194
  msgid "EmailCredential|Activation token"
166
195
  msgstr ""
167
196
 
168
- #: app/models/email_credential.rb:- app/views/credentials/index.html.erb:50
197
+ #: app/models/email_credential.rb:-
169
198
  #: app/views/credentials/email/delete.html.erb:13
170
199
  #: app/views/credentials/email/activation.html.erb:8
171
- #: app/views/signup/email/validated.html.erb:10
200
+ #: app/views/credentials/index.html.erb:53
172
201
  #: app/views/signup/email/activation.html.erb:16
202
+ #: app/views/signup/email/validated.html.erb:10
173
203
  msgid "EmailCredential|Email"
174
204
  msgstr ""
175
205
 
@@ -177,133 +207,197 @@ msgstr ""
177
207
  msgid "EmailCredential|Activated at"
178
208
  msgstr ""
179
209
 
180
- #: app/models/email_credential.rb:- app/views/credentials/index.html.erb:49
210
+ #: app/models/email_credential.rb:- app/views/credentials/index.html.erb:52
181
211
  msgid "EmailCredential|Loggedin at"
182
212
  msgstr ""
183
213
 
184
- #: app/models/email_credential.rb:22 app/views/credentials/index.html.erb:48
214
+ #: app/models/email_credential.rb:22 app/views/credentials/index.html.erb:51
185
215
  msgid "EmailCredential|Activated on"
186
216
  msgstr ""
187
217
 
188
- #: app/models/open_id_credential.rb:-
189
- msgid "open id credential"
218
+ #: app/models/password_edit_form.rb:7
219
+ msgid "EmailPasswordEditForm|Password"
190
220
  msgstr ""
191
221
 
192
- #: app/models/open_id_credential.rb:-
193
- msgid "OpenIdCredential|Identity url"
222
+ #: app/models/password_edit_form.rb:8
223
+ msgid "EmailPasswordEditForm|Password confirmation"
194
224
  msgstr ""
195
225
 
196
- #: app/models/open_id_credential.rb:- app/views/credentials/index.html.erb:10
197
- msgid "OpenIdCredential|Loggedin at"
226
+ #: app/models/activation_mailer.rb:17
227
+ msgctxt "MultiAuth"
228
+ msgid "User registration"
198
229
  msgstr ""
199
230
 
200
- #: app/models/open_id_credential.rb:19 app/views/credentials/index.html.erb:9
201
- msgid "OpenIdCredential|Activated on"
231
+ #: app/models/activation_mailer.rb:30
232
+ msgctxt "MultiAuth"
233
+ msgid "User registration completed"
202
234
  msgstr ""
203
235
 
204
- #: app/models/email_login_form.rb:15
205
- msgid "EmailLoginForm|Email"
236
+ #: app/models/activation_mailer.rb:44
237
+ msgctxt "MultiAuth"
238
+ msgid "Email address registration for authentication"
206
239
  msgstr ""
207
240
 
208
- #: app/models/email_login_form.rb:16
209
- msgid "EmailLoginForm|Password"
241
+ #: app/models/activation_mailer.rb:57
242
+ msgctxt "MultiAuth"
243
+ msgid "Email address registration for authentication completed"
210
244
  msgstr ""
211
245
 
212
- #: app/models/email_password_edit_form.rb:15
213
- msgid "EmailPasswordEditForm|Password"
246
+ #: app/models/activation_mailer.rb:71
247
+ msgctxt "MultiAuth"
248
+ msgid "Email address registration for notification"
214
249
  msgstr ""
215
250
 
216
- #: app/models/email_password_edit_form.rb:16
217
- msgid "EmailPasswordEditForm|Password confirmation"
251
+ #: app/models/activation_mailer.rb:84
252
+ msgctxt "MultiAuth"
253
+ msgid "Email address registration for notification completed"
218
254
  msgstr ""
219
255
 
220
- #: app/views/credentials/index.html.erb:2
256
+ #: app/models/name_login_form.rb:5
257
+ msgid "NameLoginForm|Name"
258
+ msgstr ""
259
+
260
+ #: app/models/name_login_form.rb:6
261
+ msgid "NameLoginForm|Password"
262
+ msgstr ""
263
+
264
+ #: app/models/open_id_credential.rb:-
265
+ msgid "open id credential"
266
+ msgstr ""
267
+
268
+ #: app/models/open_id_credential.rb:-
269
+ msgid "OpenIdCredential|Identity url"
270
+ msgstr ""
271
+
272
+ #: app/models/open_id_credential.rb:- app/views/credentials/index.html.erb:11
273
+ msgid "OpenIdCredential|Loggedin at"
274
+ msgstr ""
275
+
276
+ #: app/models/open_id_credential.rb:19 app/views/credentials/index.html.erb:10
277
+ msgid "OpenIdCredential|Activated on"
278
+ msgstr ""
279
+
280
+ #: app/views/activation_mailer/complete_for_credential.erb:1
221
281
  msgctxt "MultiAuth"
222
- msgid "Login setting"
282
+ msgid "The registration of the email address authentication was completed."
223
283
  msgstr ""
224
284
 
225
- #: app/views/credentials/index.html.erb:4
285
+ #: app/views/activation_mailer/request_for_notice.erb:1
226
286
  msgctxt "MultiAuth"
227
- msgid "OpenID authentication"
287
+ msgid "Email address for notification will be registered."
228
288
  msgstr ""
229
289
 
230
- #: app/views/credentials/index.html.erb:19
290
+ #: app/views/activation_mailer/request_for_notice.erb:2
291
+ #: app/views/activation_mailer/request_for_signup.erb:2
292
+ #: app/views/activation_mailer/request_for_credential.erb:2
231
293
  msgctxt "MultiAuth"
232
- msgid "Add OpenID authentication"
294
+ msgid "Registration is completed by accessing following URL."
233
295
  msgstr ""
234
296
 
235
- #: app/views/credentials/index.html.erb:27
297
+ #: app/views/activation_mailer/request_for_notice.erb:6
298
+ #: app/views/activation_mailer/request_for_signup.erb:6
299
+ #: app/views/activation_mailer/request_for_credential.erb:6
236
300
  msgctxt "MultiAuth"
237
- msgid "There are no OpenID authentication."
301
+ msgid "- For access with cellular phone etc."
238
302
  msgstr ""
239
303
 
240
- #: app/views/credentials/index.html.erb:36
241
- #: app/views/credentials/index.html.erb:81
242
- #: app/views/credentials/open_id/delete.html.erb:19
243
- #: app/views/credentials/email/delete.html.erb:19
304
+ #: app/views/activation_mailer/request_for_notice.erb:7
305
+ #: app/views/activation_mailer/request_for_signup.erb:7
306
+ #: app/views/activation_mailer/request_for_credential.erb:7
244
307
  msgctxt "MultiAuth"
245
- msgid "Delete"
308
+ msgid ""
309
+ "It is not possible to register from the cellular phone etc. that do not "
310
+ "correspond to Cookie now."
246
311
  msgstr ""
247
312
 
248
- #: app/views/credentials/index.html.erb:43
313
+ #: app/views/activation_mailer/request_for_notice.erb:8
314
+ #: app/views/activation_mailer/request_for_signup.erb:8
315
+ #: app/views/activation_mailer/request_for_credential.erb:8
249
316
  msgctxt "MultiAuth"
250
- msgid "Email address authentication"
317
+ msgid ""
318
+ "Please register after forwarding this mail to PC etc. though it is time."
251
319
  msgstr ""
252
320
 
253
- #: app/views/credentials/index.html.erb:58
321
+ #: app/views/activation_mailer/request_for_signup.erb:1
254
322
  msgctxt "MultiAuth"
255
- msgid "Add email address authentication"
323
+ msgid "Thank you for the user registration to %{app}."
256
324
  msgstr ""
257
325
 
258
- #: app/views/credentials/index.html.erb:66
326
+ #: app/views/activation_mailer/complete_for_notice.erb:1
259
327
  msgctxt "MultiAuth"
260
- msgid "There are no email address authentication."
328
+ msgid "The email address registration was completed."
261
329
  msgstr ""
262
330
 
263
- #: app/views/credentials/index.html.erb:77
331
+ #: app/views/activation_mailer/request_for_credential.erb:1
264
332
  msgctxt "MultiAuth"
265
- msgid "Waiting for activation"
333
+ msgid "Email address for authentication will be registered."
266
334
  msgstr ""
267
335
 
268
- #: app/views/credentials/index.html.erb:80
269
- #: app/views/credentials/email/edit_password.html.erb:2
336
+ #: app/views/activation_mailer/complete_for_signup.erb:1
270
337
  msgctxt "MultiAuth"
271
- msgid "Update password"
338
+ msgid "The user registration was completed."
272
339
  msgstr ""
273
340
 
274
- #: app/views/credentials/open_id/delete.html.erb:2
275
- #: app/views/credentials/open_id/delete.html.erb:7
341
+ #: app/views/credentials/name/delete.html.erb:1
342
+ #: app/views/credentials/name/delete.html.erb:6
276
343
  msgctxt "MultiAuth"
277
- msgid "Delete OpenID authentication credential."
344
+ msgid "Delete name authentication credential."
278
345
  msgstr ""
279
346
 
280
- #: app/views/credentials/open_id/delete.html.erb:8
347
+ #: app/views/credentials/name/delete.html.erb:7
281
348
  #: app/views/credentials/email/delete.html.erb:8
349
+ #: app/views/credentials/open_id/delete.html.erb:8
282
350
  msgctxt "MultiAuth"
283
351
  msgid "Are you sure?"
284
352
  msgstr ""
285
353
 
286
- #: app/views/credentials/open_id/new.html.erb:2
354
+ #: app/views/credentials/name/delete.html.erb:18
355
+ #: app/views/credentials/email/delete.html.erb:19
356
+ #: app/views/credentials/index.html.erb:37
357
+ #: app/views/credentials/index.html.erb:84
358
+ #: app/views/credentials/index.html.erb:126
359
+ #: app/views/credentials/open_id/delete.html.erb:19
287
360
  msgctxt "MultiAuth"
288
- msgid "Add OpenID authentication credential"
361
+ msgid "Delete"
289
362
  msgstr ""
290
363
 
291
- #: app/views/credentials/open_id/new.html.erb:16
364
+ #: app/views/credentials/name/new.html.erb:1
365
+ msgctxt "MultiAuth"
366
+ msgid "Add name authentication credential"
367
+ msgstr ""
368
+
369
+ #: app/views/credentials/name/new.html.erb:24
292
370
  #: app/views/credentials/email/new.html.erb:25
371
+ #: app/views/credentials/open_id/new.html.erb:16
293
372
  msgctxt "MultiAuth"
294
373
  msgid "Add"
295
374
  msgstr ""
296
375
 
376
+ #: app/views/credentials/name/edit_password.html.erb:1
377
+ #: app/views/credentials/email/edit_password.html.erb:2
378
+ #: app/views/credentials/index.html.erb:83
379
+ #: app/views/credentials/index.html.erb:125
380
+ msgctxt "MultiAuth"
381
+ msgid "Update password"
382
+ msgstr ""
383
+
384
+ #: app/views/credentials/name/edit_password.html.erb:20
297
385
  #: app/views/credentials/email/edit_password.html.erb:21
298
386
  msgctxt "MultiAuth"
299
387
  msgid "Update"
300
388
  msgstr ""
301
389
 
390
+ #: app/views/credentials/email/delete.html.erb:2
391
+ #: app/views/credentials/email/delete.html.erb:7
392
+ msgctxt "MultiAuth"
393
+ msgid "Delete email authentication credential."
394
+ msgstr ""
395
+
302
396
  #: app/views/credentials/email/activated.html.erb:2
303
- #: app/views/signup/open_id/created.html.erb:4
304
- #: app/views/signup/email/_progress.html.erb:13
305
397
  #: app/views/signup/email/activated.html.erb:4
306
398
  #: app/views/signup/email/activated.html.erb:8
399
+ #: app/views/signup/email/_progress.html.erb:13
400
+ #: app/views/signup/open_id/created.html.erb:4
307
401
  msgctxt "MultiAuth"
308
402
  msgid "Registration completed"
309
403
  msgstr ""
@@ -313,10 +407,14 @@ msgctxt "MultiAuth"
313
407
  msgid "Top"
314
408
  msgstr ""
315
409
 
316
- #: app/views/credentials/email/delete.html.erb:2
317
- #: app/views/credentials/email/delete.html.erb:7
410
+ #: app/views/credentials/email/activation.html.erb:2
318
411
  msgctxt "MultiAuth"
319
- msgid "Delete email authentication credential."
412
+ msgid "Activation"
413
+ msgstr ""
414
+
415
+ #: app/views/credentials/email/activation.html.erb:14
416
+ msgctxt "MultiAuth"
417
+ msgid "Activate"
320
418
  msgstr ""
321
419
 
322
420
  #: app/views/credentials/email/new.html.erb:2
@@ -341,107 +439,168 @@ msgctxt "MultiAuth"
341
439
  msgid "Back"
342
440
  msgstr ""
343
441
 
344
- #: app/views/credentials/email/activation.html.erb:2
442
+ #: app/views/credentials/index.html.erb:2
345
443
  msgctxt "MultiAuth"
346
- msgid "Activation"
444
+ msgid "Login setting"
347
445
  msgstr ""
348
446
 
349
- #: app/views/credentials/email/activation.html.erb:14
447
+ #: app/views/credentials/index.html.erb:5
350
448
  msgctxt "MultiAuth"
351
- msgid "Activate"
449
+ msgid "OpenID authentication"
352
450
  msgstr ""
353
451
 
354
- #: app/views/auth/logged_out.html.erb:2
452
+ #: app/views/credentials/index.html.erb:20
355
453
  msgctxt "MultiAuth"
356
- msgid "You have been logged out."
454
+ msgid "Add OpenID authentication"
357
455
  msgstr ""
358
456
 
359
- #: app/views/auth/logged_out.html.erb:21 app/views/auth/logged_in.html.erb:21
457
+ #: app/views/credentials/index.html.erb:28
360
458
  msgctxt "MultiAuth"
361
- msgid "Please click %{link} when the page doesn't change."
459
+ msgid "There are no OpenID authentication."
460
+ msgstr ""
461
+
462
+ #: app/views/credentials/index.html.erb:46
463
+ msgctxt "MultiAuth"
464
+ msgid "Email address authentication"
465
+ msgstr ""
466
+
467
+ #: app/views/credentials/index.html.erb:61
468
+ msgctxt "MultiAuth"
469
+ msgid "Add email address authentication"
470
+ msgstr ""
471
+
472
+ #: app/views/credentials/index.html.erb:69
473
+ msgctxt "MultiAuth"
474
+ msgid "There are no email address authentication."
475
+ msgstr ""
476
+
477
+ #: app/views/credentials/index.html.erb:80
478
+ msgctxt "MultiAuth"
479
+ msgid "Waiting for activation"
480
+ msgstr ""
481
+
482
+ #: app/views/credentials/index.html.erb:93
483
+ msgctxt "MultiAuth"
484
+ msgid "Name authentication"
485
+ msgstr ""
486
+
487
+ #: app/views/credentials/index.html.erb:107
488
+ msgctxt "MultiAuth"
489
+ msgid "Add name authentication"
490
+ msgstr ""
491
+
492
+ #: app/views/credentials/index.html.erb:115
493
+ msgctxt "MultiAuth"
494
+ msgid "There are no name authentication."
495
+ msgstr ""
496
+
497
+ #: app/views/credentials/open_id/delete.html.erb:2
498
+ #: app/views/credentials/open_id/delete.html.erb:7
499
+ msgctxt "MultiAuth"
500
+ msgid "Delete OpenID authentication credential."
501
+ msgstr ""
502
+
503
+ #: app/views/credentials/open_id/new.html.erb:2
504
+ msgctxt "MultiAuth"
505
+ msgid "Add OpenID authentication credential"
506
+ msgstr ""
507
+
508
+ #: app/views/signup/email/activated.html.erb:2
509
+ #: app/views/signup/email/activation.html.erb:2
510
+ #: app/views/signup/email/validated.html.erb:2
511
+ #: app/views/signup/email/index.html.erb:2
512
+ #: app/views/signup/email/created.html.erb:2
513
+ #: app/views/signup/open_id/authenticated.html.erb:2
514
+ #: app/views/signup/open_id/index.html.erb:2
515
+ #: app/views/signup/open_id/created.html.erb:2
516
+ msgctxt "MultiAuth"
517
+ msgid "Signup"
362
518
  msgstr ""
363
519
 
364
- #: app/views/auth/index.html.erb:1 app/views/auth/index.html.erb:16
365
- #: app/views/auth/index.html.erb:39 app/views/auth/open_id/index.html.erb:2
366
- #: app/views/auth/open_id/index.html.erb:17
367
- #: app/views/auth/email/index.html.erb:2
368
- #: app/views/auth/email/index.html.erb:64
369
- #: app/views/auth/email/index.html.erb:82
370
- #: app/views/signup/open_id/created.html.erb:6
371
520
  #: app/views/signup/email/activated.html.erb:9
521
+ #: app/views/signup/open_id/created.html.erb:6
522
+ #: app/views/auth/name/index.html.erb:1 app/views/auth/name/index.html.erb:63
523
+ #: app/views/auth/name/index.html.erb:81 app/views/auth/email/index.html.erb:2
524
+ #: app/views/auth/email/index.html.erb:64
525
+ #: app/views/auth/email/index.html.erb:82 app/views/auth/index.html.erb:1
526
+ #: app/views/auth/index.html.erb:16 app/views/auth/index.html.erb:39
527
+ #: app/views/auth/open_id/index.html.erb:2
528
+ #: app/views/auth/open_id/index.html.erb:17
372
529
  msgctxt "MultiAuth"
373
530
  msgid "Login"
374
531
  msgstr ""
375
532
 
376
- #: app/views/auth/index.html.erb:5
533
+ #: app/views/signup/email/activation.html.erb:4
534
+ #: app/views/signup/email/validated.html.erb:4
535
+ #: app/views/signup/email/_progress.html.erb:12
377
536
  msgctxt "MultiAuth"
378
- msgid "By OpenID"
537
+ msgid "Registration confirmation"
379
538
  msgstr ""
380
539
 
381
- #: app/views/auth/index.html.erb:21
540
+ #: app/views/signup/email/activation.html.erb:9
382
541
  msgctxt "MultiAuth"
383
- msgid "By email address"
542
+ msgid "Valid activation token"
384
543
  msgstr ""
385
544
 
386
- #: app/views/activation_mailer/request_for_credential.erb:1
545
+ #: app/views/signup/email/activation.html.erb:11
387
546
  msgctxt "MultiAuth"
388
- msgid "Email address for authentication will be registered."
547
+ msgid "Activated"
389
548
  msgstr ""
390
549
 
391
- #: app/views/activation_mailer/request_for_credential.erb:2
392
- #: app/views/activation_mailer/request_for_signup.erb:2
393
- #: app/views/activation_mailer/request_for_notice.erb:2
550
+ #: app/views/signup/email/activation.html.erb:13
394
551
  msgctxt "MultiAuth"
395
- msgid "Registration is completed by accessing following URL."
552
+ msgid "Inactivated"
396
553
  msgstr ""
397
554
 
398
- #: app/views/activation_mailer/request_for_credential.erb:8
399
- #: app/views/activation_mailer/request_for_signup.erb:8
400
- #: app/views/activation_mailer/request_for_notice.erb:8
555
+ #: app/views/signup/email/activation.html.erb:22
401
556
  msgctxt "MultiAuth"
402
- msgid "- For access with cellular phone etc."
557
+ msgid "Regist"
403
558
  msgstr ""
404
559
 
405
- #: app/views/activation_mailer/request_for_credential.erb:9
406
- #: app/views/activation_mailer/request_for_signup.erb:9
407
- #: app/views/activation_mailer/request_for_notice.erb:9
560
+ #: app/views/signup/email/activation.html.erb:26
408
561
  msgctxt "MultiAuth"
409
- msgid ""
410
- "It is not possible to register from the cellular phone etc. that do not "
411
- "correspond to Cookie now."
562
+ msgid "Invalid activation token"
563
+ msgstr ""
564
+
565
+ #: app/views/signup/email/validated.html.erb:14
566
+ msgid "EmailCredential|Password"
412
567
  msgstr ""
413
568
 
414
- #: app/views/activation_mailer/request_for_credential.erb:10
415
- #: app/views/activation_mailer/request_for_signup.erb:10
416
- #: app/views/activation_mailer/request_for_notice.erb:10
569
+ #: app/views/signup/email/validated.html.erb:20
570
+ #: app/views/signup/open_id/authenticated.html.erb:14
417
571
  msgctxt "MultiAuth"
418
- msgid ""
419
- "Please register after forwarding this mail to PC etc. though it is time."
572
+ msgid "Register"
420
573
  msgstr ""
421
574
 
422
- #: app/views/activation_mailer/request_for_signup.erb:1
575
+ #: app/views/signup/email/index.html.erb:4
423
576
  msgctxt "MultiAuth"
424
- msgid "Thank you for the user registration to %{app}."
577
+ msgid "Signup by email address"
425
578
  msgstr ""
426
579
 
427
- #: app/views/activation_mailer/complete_for_notice.erb:1
580
+ #: app/views/signup/email/index.html.erb:27 app/views/signup/index.html.erb:60
428
581
  msgctxt "MultiAuth"
429
- msgid "The email address registration was completed."
582
+ msgid "Confirm"
430
583
  msgstr ""
431
584
 
432
- #: app/views/activation_mailer/request_for_notice.erb:1
585
+ #: app/views/signup/email/created.html.erb:4
586
+ #: app/views/signup/email/_progress.html.erb:11
433
587
  msgctxt "MultiAuth"
434
- msgid "Email address for notification will be registered."
588
+ msgid "Pre-registration completed"
435
589
  msgstr ""
436
590
 
437
- #: app/views/activation_mailer/complete_for_credential.erb:1
591
+ #: app/views/signup/email/created.html.erb:9
438
592
  msgctxt "MultiAuth"
439
- msgid "The registration of the email address authentication was completed."
593
+ msgid "Sent a mail to %{email}."
440
594
  msgstr ""
441
595
 
442
- #: app/views/activation_mailer/complete_for_signup.erb:1
596
+ #: app/views/signup/email/_progress.html.erb:9
443
597
  msgctxt "MultiAuth"
444
- msgid "The user registration was completed."
598
+ msgid "Input login info"
599
+ msgstr ""
600
+
601
+ #: app/views/signup/email/_progress.html.erb:10
602
+ msgctxt "MultiAuth"
603
+ msgid "Confirm login info"
445
604
  msgstr ""
446
605
 
447
606
  #: app/views/signup/index.html.erb:2
@@ -511,94 +670,39 @@ msgctxt "MultiAuth"
511
670
  msgid "Recieve confirmation mail"
512
671
  msgstr ""
513
672
 
514
- #: app/views/signup/index.html.erb:60 app/views/signup/email/index.html.erb:27
515
- msgctxt "MultiAuth"
516
- msgid "Confirm"
517
- msgstr ""
518
-
519
- #: app/views/signup/open_id/authenticated.html.erb:2
520
- #: app/views/signup/open_id/index.html.erb:2
521
- #: app/views/signup/open_id/created.html.erb:2
522
- #: app/views/signup/email/activated.html.erb:2
523
- #: app/views/signup/email/index.html.erb:2
524
- #: app/views/signup/email/created.html.erb:2
525
- #: app/views/signup/email/validated.html.erb:2
526
- #: app/views/signup/email/activation.html.erb:2
527
- msgctxt "MultiAuth"
528
- msgid "Signup"
529
- msgstr ""
530
-
531
673
  #: app/views/signup/open_id/authenticated.html.erb:4
532
674
  msgctxt "MultiAuth"
533
675
  msgid "Authentication completed"
534
676
  msgstr ""
535
677
 
536
- #: app/views/signup/open_id/authenticated.html.erb:14
537
- #: app/views/signup/email/validated.html.erb:20
538
- msgctxt "MultiAuth"
539
- msgid "Register"
540
- msgstr ""
541
-
542
- #: app/views/signup/email/_progress.html.erb:9
543
- msgctxt "MultiAuth"
544
- msgid "Input login info"
545
- msgstr ""
546
-
547
- #: app/views/signup/email/_progress.html.erb:10
548
- msgctxt "MultiAuth"
549
- msgid "Confirm login info"
550
- msgstr ""
551
-
552
- #: app/views/signup/email/_progress.html.erb:11
553
- #: app/views/signup/email/created.html.erb:4
554
- msgctxt "MultiAuth"
555
- msgid "Pre-registration completed"
556
- msgstr ""
557
-
558
- #: app/views/signup/email/_progress.html.erb:12
559
- #: app/views/signup/email/validated.html.erb:4
560
- #: app/views/signup/email/activation.html.erb:4
561
- msgctxt "MultiAuth"
562
- msgid "Registration confirmation"
563
- msgstr ""
564
-
565
- #: app/views/signup/email/index.html.erb:4
566
- msgctxt "MultiAuth"
567
- msgid "Signup by email address"
568
- msgstr ""
569
-
570
- #: app/views/signup/email/created.html.erb:9
678
+ #: app/views/auth/logged_out.html.erb:2
571
679
  msgctxt "MultiAuth"
572
- msgid "Sent a mail to %{email}."
573
- msgstr ""
574
-
575
- #: app/views/signup/email/validated.html.erb:14
576
- msgid "EmailCredential|Password"
680
+ msgid "You have been logged out."
577
681
  msgstr ""
578
682
 
579
- #: app/views/signup/email/activation.html.erb:9
683
+ #: app/views/auth/logged_out.html.erb:10 app/views/auth/logged_in.html.erb:10
580
684
  msgctxt "MultiAuth"
581
- msgid "Valid activation token"
685
+ msgid "Please click %{link} when the page doesn't change."
582
686
  msgstr ""
583
687
 
584
- #: app/views/signup/email/activation.html.erb:11
688
+ #: app/views/auth/index.html.erb:5
585
689
  msgctxt "MultiAuth"
586
- msgid "Activated"
690
+ msgid "By OpenID"
587
691
  msgstr ""
588
692
 
589
- #: app/views/signup/email/activation.html.erb:13
693
+ #: app/views/auth/index.html.erb:21
590
694
  msgctxt "MultiAuth"
591
- msgid "Inactivated"
695
+ msgid "By email address"
592
696
  msgstr ""
593
697
 
594
- #: app/views/signup/email/activation.html.erb:22
698
+ #: lib/multi_auth/action_controller.rb:34
595
699
  msgctxt "MultiAuth"
596
- msgid "Regist"
700
+ msgid "Session has expired. Please login again."
597
701
  msgstr ""
598
702
 
599
- #: app/views/signup/email/activation.html.erb:26
703
+ #: lib/multi_auth/action_controller.rb:43
600
704
  msgctxt "MultiAuth"
601
- msgid "Invalid activation token"
705
+ msgid "Login required."
602
706
  msgstr ""
603
707
 
604
708
  #: lib/open_id_authentication/result.rb:5
@@ -625,13 +729,3 @@ msgstr ""
625
729
  msgctxt "OpenIdAuthentication"
626
730
  msgid "OpenID verification needs setup"
627
731
  msgstr ""
628
-
629
- #: lib/multi_auth/action_controller.rb:34
630
- msgctxt "MultiAuth"
631
- msgid "Session has expired. Please login again."
632
- msgstr ""
633
-
634
- #: lib/multi_auth/action_controller.rb:43
635
- msgctxt "MultiAuth"
636
- msgid "Login required."
637
- msgstr ""