Skip to content

Commit b05cf08

Browse files
msallemsalle
committed
Replace several 'tags' with the English text
We can remove several tags, login:processing and admin:metaconv_selectfile, and replace several others with their English text.
1 parent 1fb7c4c commit b05cf08

7 files changed

Lines changed: 34 additions & 103 deletions

File tree

‎lib/SimpleSAML/Error/ErrorCodes.php‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ final public static function defaultGetAllErrorCodeTitles(): array
2424
{
2525
return [
2626
'ACSPARAMS' => Translate::noop('{errors:title_ACSPARAMS}'),
27-
'ARSPARAMS' => Translate::noop('{errors:title_ARSPARAMS}'),
27+
'ARSPARAMS' => Translate::noop('No SAML message provided'),
2828
'AUTHSOURCEERROR' => Translate::noop('{errors:title_AUTHSOURCEERROR}'),
2929
'BADREQUEST' => Translate::noop('{errors:title_BADREQUEST}'),
3030
'CASERROR' => Translate::noop('{errors:title_CASERROR}'),
@@ -36,7 +36,7 @@ final public static function defaultGetAllErrorCodeTitles(): array
3636
'LDAPERROR' => Translate::noop('{errors:title_LDAPERROR}'),
3737
'LOGOUTINFOLOST' => Translate::noop('{errors:title_LOGOUTINFOLOST}'),
3838
'LOGOUTREQUEST' => Translate::noop('{errors:title_LOGOUTREQUEST}'),
39-
'MEMCACHEDOWN' => Translate::noop('{errors:title_MEMCACHEDOWN}'),
39+
'MEMCACHEDOWN' => Translate::noop('Cannot retrieve session data'),
4040
'METADATA' => Translate::noop('{errors:title_METADATA}'),
4141
'METADATANOTFOUND' => Translate::noop('{errors:title_METADATANOTFOUND}'),
4242
'NOACCESS' => Translate::noop('{errors:title_NOACCESS}'),
@@ -51,7 +51,7 @@ final public static function defaultGetAllErrorCodeTitles(): array
5151
'PROCESSAUTHNREQUEST' => Translate::noop('{errors:title_PROCESSAUTHNREQUEST}'),
5252
'RESPONSESTATUSNOSUCCESS' => Translate::noop('{errors:title_RESPONSESTATUSNOSUCCESS}'),
5353
'SLOSERVICEPARAMS' => Translate::noop('{errors:title_SLOSERVICEPARAMS}'),
54-
'SSOPARAMS' => Translate::noop('{errors:title_SSOPARAMS}'),
54+
'SSOPARAMS' => Translate::noop('No SAML request provided'),
5555
'UNHANDLEDEXCEPTION' => Translate::noop('{errors:title_UNHANDLEDEXCEPTION}'),
5656
'UNKNOWNCERT' => Translate::noop('{errors:title_UNKNOWNCERT}'),
5757
'USERABORTED' => Translate::noop('{errors:title_USERABORTED}'),
@@ -82,7 +82,10 @@ final public static function defaultGetAllErrorCodeDescriptions(): array
8282
{
8383
return [
8484
'ACSPARAMS' => Translate::noop('{errors:descr_ACSPARAMS}'),
85-
'ARSPARAMS' => Translate::noop('{errors:descr_ARSPARAMS}'),
85+
'ARSPARAMS' => Translate::noop(""
86+
"You accessed the Artifact Resolution Service interface, but did not "
87+
"provide a SAML ArtifactResolve message. Please note that this endpoint is"
88+
" not intended to be accessed directly."),
8689
'AUTHSOURCEERROR' => Translate::noop('{errors:descr_AUTHSOURCEERROR}'),
8790
'BADREQUEST' => Translate::noop('{errors:descr_BADREQUEST}'),
8891
'CASERROR' => Translate::noop('{errors:descr_CASERROR}'),
@@ -109,7 +112,10 @@ final public static function defaultGetAllErrorCodeDescriptions(): array
109112
'PROCESSAUTHNREQUEST' => Translate::noop('{errors:descr_PROCESSAUTHNREQUEST}'),
110113
'RESPONSESTATUSNOSUCCESS' => Translate::noop('{errors:descr_RESPONSESTATUSNOSUCCESS}'),
111114
'SLOSERVICEPARAMS' => Translate::noop('{errors:descr_SLOSERVICEPARAMS}'),
112-
'SSOPARAMS' => Translate::noop('{errors:descr_SSOPARAMS}'),
115+
'SSOPARAMS' => Translate::noop(""
116+
"You accessed the Single Sign On Service interface, but did not provide a "
117+
"SAML Authentication Request. Please note that this endpoint is not "
118+
"intended to be accessed directly."),
113119
'UNHANDLEDEXCEPTION' => Translate::noop('{errors:descr_UNHANDLEDEXCEPTION}'),
114120
'UNKNOWNCERT' => Translate::noop('{errors:descr_UNKNOWNCERT}'),
115121
'USERABORTED' => Translate::noop('{errors:descr_USERABORTED}'),

‎locales/el/LC_MESSAGES/messages.po‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -200,9 +200,6 @@ msgstr "Προαιρετικά πεδία"
200200
msgid "{logout:return}"
201201
msgstr "Επιστροφή στην υπηρεσία"
202202

203-
msgid "{errors:title_MEMCACHEDOWN}"
204-
msgstr "Δεν είναι δυνατή η ανάκτηση δεδομένων συνεδρίας"
205-
206203
msgid "{admin:metadata_xmlurl}"
207204
msgstr "Διεύθυνση <a href=\"%METAURL%\">λήψης</a> μεταδεδομένων:"
208205

@@ -305,9 +302,6 @@ msgstr ""
305302
"(sessions), σας συνιστούμε να <i>κλείσετε</i> το πρόγραμμα πλοήγησης (web"
306303
" browser)."
307304

308-
msgid "{admin:metaconv_selectfile}"
309-
msgstr "ή επιλέξτε αρχείο"
310-
311305
msgid "{admin:metadata_xmlformat}"
312306
msgstr "Μεταδεδομένα σε μορφή xml SAML 2.0:"
313307

‎locales/en/LC_MESSAGES/messages.po‎

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,6 @@ msgstr "State information lost"
4444
msgid "{login:username}"
4545
msgstr "Username"
4646

47-
msgid "{login:processing}"
48-
msgstr "Processing..."
49-
5047
msgid "Back"
5148
msgstr "Back"
5249

@@ -91,9 +88,6 @@ msgstr "Unable to locate metadata for %ENTITYID%"
9188
msgid "{admin:metadata_metadata}"
9289
msgstr "Metadata"
9390

94-
msgid "{errors:title_SSOPARAMS}"
95-
msgstr "No SAML request provided"
96-
9791
msgid "{errors:report_text}"
9892
msgstr ""
9993
"Optionally enter your email address, for the administrators to be able "
@@ -196,9 +190,6 @@ msgstr ""
196190
"The parameters sent to the discovery service were not according to "
197191
"specifications."
198192

199-
msgid "{errors:title_ARSPARAMS}"
200-
msgstr "No SAML message provided"
201-
202193
msgid "{errors:descr_CREATEREQUEST}"
203194
msgstr "An error occurred when trying to create the SAML request."
204195

@@ -208,9 +199,6 @@ msgstr "Optional fields"
208199
msgid "{logout:return}"
209200
msgstr "Return to service"
210201

211-
msgid "{errors:title_MEMCACHEDOWN}"
212-
msgstr "Cannot retrieve session data"
213-
214202
msgid "{admin:metadata_xmlurl}"
215203
msgstr "You can <a href=\"%METAURL%\">get the metadata xml on a dedicated URL</a>:"
216204

@@ -312,9 +300,6 @@ msgstr ""
312300
"logout</i>. To ensure that all your sessions are closed, you are "
313301
"encouraged to <i>close your webbrowser</i>."
314302

315-
msgid "{admin:metaconv_selectfile}"
316-
msgstr "or select a file:"
317-
318303
msgid "{admin:metadata_xmlformat}"
319304
msgstr "In SAML 2.0 Metadata XML format:"
320305

@@ -500,12 +485,6 @@ msgstr "Send e-mail to help desk"
500485
msgid "{login:help_desk_link}"
501486
msgstr "Help desk homepage"
502487

503-
msgid "{errors:descr_ARSPARAMS}"
504-
msgstr ""
505-
"You accessed the Artifact Resolution Service interface, but did not "
506-
"provide a SAML ArtifactResolve message. Please note that this endpoint is"
507-
" not intended to be accessed directly."
508-
509488
msgid "{login:remember_me}"
510489
msgstr "Remember me"
511490

@@ -627,12 +606,6 @@ msgstr ""
627606
msgid "{disco:selectidp_full}"
628607
msgstr "Please select the identity provider where you want to authenticate:"
629608

630-
msgid "{errors:descr_SSOPARAMS}"
631-
msgstr ""
632-
"You accessed the Single Sign On Service interface, but did not provide a "
633-
"SAML Authentication Request. Please note that this endpoint is not "
634-
"intended to be accessed directly."
635-
636609
msgid "{errors:descr_NOTFOUNDREASON}"
637610
msgstr "The given page was not found. The reason was: %REASON% The URL was: %URL%"
638611

‎locales/nl/LC_MESSAGES/messages.po‎

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,6 @@ msgstr "Toestandsinformatie verloren"
4444
msgid "{login:username}"
4545
msgstr "Gebruikersnaam"
4646

47-
msgid "{login:processing}"
48-
msgstr "Bezig te verwerken..."
49-
5047
msgid "Back"
5148
msgstr "Terug"
5249

@@ -91,9 +88,6 @@ msgstr "Kan geen metadata vinden voor %ENTITYID%"
9188
msgid "{admin:metadata_metadata}"
9289
msgstr "Metadata"
9390

94-
msgid "{errors:title_SSOPARAMS}"
95-
msgstr "Geen SAML request opgegeven"
96-
9791
msgid "{errors:report_text}"
9892
msgstr ""
9993
"Voeg desgewenst je e-mailadres toe, zodat de beheerders contact kunnen "
@@ -195,7 +189,7 @@ msgstr ""
195189
"De parameters die naar de discovery service zijn gestuurd, zijn niet "
196190
"correct volgens de specificatie."
197191

198-
msgid "{errors:title_ARSPARAMS}"
192+
msgid "No SAML message provided"
199193
msgstr "Geen SAML bericht opgegeven"
200194

201195
msgid "{errors:descr_CREATEREQUEST}"
@@ -207,9 +201,6 @@ msgstr "Optionele velden"
207201
msgid "{logout:return}"
208202
msgstr "Terug naar service"
209203

210-
msgid "{errors:title_MEMCACHEDOWN}"
211-
msgstr "Kan sessie data niet ophalen"
212-
213204
msgid "{admin:metadata_xmlurl}"
214205
msgstr ""
215206
"U kunt <a href=\"%METAURL%\">deze directe URL gebruiken</a> om de "
@@ -315,9 +306,6 @@ msgstr ""
315306
"voor uitloggen</i>. Om er zeker van te zijn dat al je sessies zijn "
316307
"beëindigd, kun je het beste <i>je webbrowser afsluiten</i>."
317308

318-
msgid "{admin:metaconv_selectfile}"
319-
msgstr "of kies een file:"
320-
321309
msgid "{admin:metadata_xmlformat}"
322310
msgstr "In SAML 2.0 Metadata XML formaat:"
323311

@@ -505,12 +493,6 @@ msgstr "Stuur een e-mail naar de helpdesk"
505493
msgid "{login:help_desk_link}"
506494
msgstr "Helpdesk homepage"
507495

508-
msgid "{errors:descr_ARSPARAMS}"
509-
msgstr ""
510-
"Je hebt het Artifact Resolution Service interface aangeroepen, maar stuurde "
511-
"geen SAML ArtifactResolve bericht mee. Merk op dat dit 'endpoint' niet "
512-
"bedoeld is om direct benaderd te worden."
513-
514496
msgid "{login:remember_me}"
515497
msgstr "Onthoud mij"
516498

@@ -630,12 +612,6 @@ msgstr ""
630612
msgid "{disco:selectidp_full}"
631613
msgstr "Selecteer de Identity Provider waar je wil authenticeren:"
632614

633-
msgid "{errors:descr_SSOPARAMS}"
634-
msgstr ""
635-
"Je hebt het Single Sign On interface aangeroepen, maar stuurde geen SAML "
636-
"Authentication Request mee. Merk op dat dit 'endpoint' niet bedoeld is om"
637-
" direct benaderd te worden."
638-
639615
msgid "{errors:descr_NOTFOUNDREASON}"
640616
msgstr ""
641617
"De opgegeven pagina kon niet worden gevonden. De oorzaak is: %REASON%. De"

‎locales/st/LC_MESSAGES/messages.po‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -108,12 +108,6 @@ msgstr ""
108108
msgid "{login:contact_info}"
109109
msgstr "Tlhahisoleseding ya boikopanyo:"
110110

111-
msgid "{errors:descr_ARSPARAMS}"
112-
msgstr ""
113-
"O fihletse kopano ya Tshebeletso ya Tlhakiso ya Athifekte, empa ha o a "
114-
"fana ka molaetsa wa SAML ArtifactResolve. Ka kopo lemoha hore ntlha ena "
115-
"ya bofelo ha e a rerelwa ho fihlellwa ka kotloloho."
116-
117111
msgid "{errors:descr_GENERATEAUTHNRESPONSE}"
118112
msgstr ""
119113
"Ha mofani enwa wa boitsebiso a leka ho theha karabelo ya netefatso, phoso"
@@ -189,12 +183,6 @@ msgstr "Tlaleha diphoso"
189183
msgid "Select"
190184
msgstr "Kgetha"
191185

192-
msgid "{errors:descr_SSOPARAMS}"
193-
msgstr ""
194-
"O fihletse tshebeletsano ya Tshaeno ya Hang, empa ha o a fan aka Kopo ya "
195-
"Netefatso ya SAML. Ka kopo lemoha hore ntlha ena ya bofelo ha e a rerelwa"
196-
" ho fihlellwa ka kotloloho."
197-
198186
msgid "Format"
199187
msgstr "Fomata"
200188

@@ -585,9 +573,6 @@ msgstr "Phoso ho thehweng ha kopo"
585573
msgid "We did not accept the response sent from the Identity Provider."
586574
msgstr "Ha re a amohela karabelo ho tswa ho Mofani wa Boitsebiso."
587575

588-
msgid "{errors:title_SSOPARAMS}"
589-
msgstr "Ha ho kopo ya SAML e fanweng"
590-
591576
msgid ""
592577
"You have chosen <b>%HOMEORG%</b> as your home organization. If this is "
593578
"wrong you may choose another one."
@@ -758,9 +743,6 @@ msgstr ""
758743
msgid "Authentication failed: your browser did not send any certificate"
759744
msgstr "Netefatso e hlolehile: sebadi sa hao ha se a romela setifikeiti sa letho"
760745

761-
msgid "{login:processing}"
762-
msgstr "E a sebetsa..."
763-
764746
msgid "Send e-mail to help desk"
765747
msgstr "Romela imeile ho ba deske ya thuso"
766748

@@ -1026,9 +1008,6 @@ msgstr "Phoso e hlahile ha e leka ho sebetsa Kopo ya Ho Tswa."
10261008
msgid "{errors:title_LOGOUTREQUEST}"
10271009
msgstr "Phoso ho sebetseng Kopo ya Ho Tswa"
10281010

1029-
msgid "{errors:title_ARSPARAMS}"
1030-
msgstr "Ha ho molaetsa wa SAML o fanweng"
1031-
10321011
#, python-format
10331012
msgid "Your session is valid for %SECONDS% seconds from now."
10341013
msgstr ""
@@ -1110,9 +1089,6 @@ msgstr ""
11101089
"Tlhahisoleeding ya porofensi e lahlehile, mmeha ho tsela ya ho qala kopo "
11111090
"botjha"
11121091

1113-
msgid "{errors:title_MEMCACHEDOWN}"
1114-
msgstr "Ha e a kgona ho fumana datha ya seshene"
1115-
11161092
msgid "Username"
11171093
msgstr "Lebitso la mosebedisi"
11181094

‎locales/xh/LC_MESSAGES/messages.po‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ msgstr ""
3535
msgid "{errors:descr_NOSTATE}"
3636
msgstr "Inkcazelo yobume ilahlekile, yaye akukho ndlela yokuqalisa isicelo"
3737

38-
msgid "{errors:title_SSOPARAMS}"
38+
msgid "No SAML request provided"
3939
msgstr "Akukho sicelo se-SAML sinikelweyo"
4040

4141
msgid "{errors:descr_CASERROR}"
@@ -207,7 +207,10 @@ msgstr "Hayi, rhoxisa"
207207
msgid "{status:header_diagnostics}"
208208
msgstr "Uhlalutyo lwe-SimpleSAMLphp"
209209

210-
msgid "{errors:descr_SSOPARAMS}"
210+
msgid ""
211+
"You accessed the Single Sign On Service interface, but did not provide a "
212+
"SAML Authentication Request. Please note that this endpoint is not "
213+
"intended to be accessed directly."
211214
msgstr ""
212215
"Ufikelele i-intafeyisi ye-Single Sign On Service, kodwa awukhange unikele"
213216
" iMpendulo Yongqinisiso ye-SAML. Nceda uqaphele ukuba le ndawo yokuphela "
@@ -396,9 +399,6 @@ msgstr ""
396399
"Uye wakhetha u-<b>%HOMEORG%</b> njengombutho wakho wekhaya. Ukuba oku "
397400
"akuchanekanga usenokukhetha omnye."
398401

399-
msgid "{login:processing}"
400-
msgstr "Iyaprosesa..."
401-
402402
msgid "{logout:default_link_text}"
403403
msgstr "Buyela emva kwikhasi lofakelo le-SimpleSAMLphp"
404404

@@ -458,13 +458,16 @@ msgstr ""
458458
"Ungqinisiso lusilele: ibhrawuza yakho ayithumelanga nasiphi na "
459459
"isatifikethi"
460460

461-
msgid "{errors:descr_ARSPARAMS}"
461+
msgid ""
462+
"You accessed the Artifact Resolution Service interface, but did not "
463+
"provide a SAML ArtifactResolve message. Please note that this endpoint is"
464+
" not intended to be accessed directly."
462465
msgstr ""
463466
"Ufikelele i-intafeyisi ye-Artifact Resolution Service, kodwa awukhange "
464467
"unikrele umyalezo we-SAML ArtifactResolve. Nceda uqaphele ukuba le ndawo "
465468
"yokuphela ayilungiselelwanga ukuba ifikelelwe ngokuthe ngqo."
466469

467-
msgid "{errors:title_MEMCACHEDOWN}"
470+
msgid "Cannot retrieve session data"
468471
msgstr "Ayikwazi ukubuyisela ingcombolo yeseshoni"
469472

470473
msgid "{status:some_error_occurred}"
@@ -473,7 +476,7 @@ msgstr "Kwenzeke impazamo ethile"
473476
msgid "{errors:errorreport_text}"
474477
msgstr "Ingxelo yempazamo ithunyelwe kubalawuli."
475478

476-
msgid "{errors:title_ARSPARAMS}"
479+
msgid "No SAML message provided"
477480
msgstr "Akukho myalezo we-SAML unikelweyo"
478481

479482
msgid "{login:help_desk_email}"

0 commit comments

Comments
 (0)