Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
lib
unicaen
auth
Commits
d37defe4
Commit
d37defe4
authored
Feb 19, 2013
by
Bertrand Gauthier
Browse files
Amélioration de la prise en charge de la traduction.
parent
1e76a5c8
Changes
10
Hide whitespace changes
Inline
Side-by-side
config/module.config.php
View file @
d37defe4
...
...
@@ -66,13 +66,7 @@ return array(
'unicaen-auth'
=>
__DIR__
.
'/../view'
,
),
),
'service_manager'
=>
array
(
'factories'
=>
array
(
'translator'
=>
'\UnicaenApp\I18n\Translator\TranslatorServiceFactory'
,
),
),
'translator'
=>
array
(
'locale'
=>
'fr_FR'
,
'translation_file_patterns'
=>
array
(
array
(
'type'
=>
'gettext'
,
...
...
@@ -144,12 +138,12 @@ return array(
'home'
=>
array
(
'pages'
=>
array
(
'login'
=>
array
(
'label'
=>
"Se connecter"
,
'label'
=>
_
(
"Se connecter"
)
,
'route'
=>
'zfcuser/login'
,
'visible'
=>
false
,
),
'register'
=>
array
(
'label'
=>
"S'enregistrer"
,
'label'
=>
_
(
"S'enregistrer"
)
,
'route'
=>
'zfcuser/register'
,
'visible'
=>
false
,
),
...
...
language/en_US.mo
View file @
d37defe4
No preview for this file type
language/en_US.po
View file @
d37defe4
...
...
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 201
2-11-23 13:56
+0100\n"
"PO-Revision-Date: 201
2-11-23 14:21
+0100\n"
"POT-Creation-Date: 201
3-02-19 11:01
+0100\n"
"PO-Revision-Date: 201
3-02-19 11:03
+0100\n"
"Last-Translator: Université de Caen Basse Normandie\n"
"Language-Team: \n"
"Language: \n"
...
...
@@ -18,34 +18,33 @@ msgstr ""
"X-Poedit-SearchPath-0: ..\n"
"X-Poedit-SearchPath-1: ../../../zf-commons/zfc-user\n"
#: ../Module.php:20
0
#: ../Module.php:20
2
msgid "Sign In"
msgstr "Sign In"
#: ../Module.php:20
1
#: ../Module.php:20
3
msgid "Username"
msgstr "Username"
#: ../Module.php:20
2
#: ../Module.php:20
4
msgid "Password"
msgstr "Password"
#: ../src/UnicaenAuth/View/Helper/UserStatus.php:96
#: ../src/UnicaenAuth/View/Helper/UserProfile.php:65
#: ../src/UnicaenAuth/View/Helper/UserStatus.php:91
msgid "Erreur: identité inattendue"
msgstr "Error: unexpected identity"
#: ../src/UnicaenAuth/View/Helper/UserStatus.php:97
msgid "Aucun"
msgstr "None"
#: ../src/UnicaenAuth/View/Helper/UserProfile.php:46
msgid "Profil"
msgstr "Profile"
#: ../src/UnicaenAuth/View/Helper/UserInfo.php:52
msgid "Affectations administratives"
msgstr "Display authentication form"
#: ../src/UnicaenAuth/View/Helper/UserInfo.php:53
msgid "Affectations recherche"
msgstr ""
msgstr "
Research structure
"
#: ../src/UnicaenAuth/View/Helper/UserInfo.php:54
msgid "Responsabilités"
...
...
@@ -53,11 +52,15 @@ msgstr "Responsabilities"
#: ../src/UnicaenAuth/View/Helper/UserInfo.php:65
msgid "Aucune affectation trouvée."
msgstr ""
msgstr "
No admin structure found.
"
#: ../src/UnicaenAuth/View/Helper/UserInfo.php:96
msgid "Aucune affectation disponible."
msgstr ""
msgstr "No structure found."
#: ../src/UnicaenAuth/View/Helper/UserCurrent.php:34
msgid "Utilisateur connecté : "
msgstr "Login user : "
#: ../src/UnicaenAuth/View/Helper/UserConnection.php:49
msgid "Connexion"
...
...
@@ -75,31 +78,41 @@ msgstr "Logout"
msgid "Ferme votre session au sein de cette application"
msgstr "Close your application session"
#: ../config/module.config.php:147
msgid "Se connecter"
msgstr "Login"
#: ../config/module.config.php:152
msgid "S'enregistrer"
msgstr "Register"
#: ../../../zf-commons/zfc-user/src/ZfcUser/Form/Register.php:36
#: ../view/unicaen-user/user/register.phtml:1
msgid "Register"
msgstr "Register"
#: ../../../zf-commons/zfc-user/src/ZfcUser/Form/Base.php:8
0
#: ../../../zf-commons/zfc-user/src/ZfcUser/Form/Base.php:
7
8
msgid "Submit"
msgstr "Submit"
#: ../view/unicaen-
user
/user/register.phtml:5
#: ../view/unicaen-
auth
/user/register.phtml:5
msgid "Registration is disabled"
msgstr "Registration is disabled"
#: ../view/unicaen-
user
/user/login.phtml:31
#: ../view/unicaen-
auth
/user/login.phtml:31
msgid "Not registered?"
msgstr "Not registered?"
#: ../view/unicaen-
user
/user/login.phtml:31
#: ../view/unicaen-
auth
/user/login.phtml:31
msgid "Sign up!"
msgstr "Sign up!"
#: ../view/unicaen-
user
/user/index.phtml:2
#: ../view/unicaen-
auth
/user/index.phtml:2
msgid "Hello,"
msgstr "Hello,"
#~ msgid "Profil"
#~ msgstr "Profile"
#~ msgid "Version"
#~ msgstr "Version"
...
...
language/fr_FR.mo
View file @
d37defe4
No preview for this file type
language/fr_FR.po
View file @
d37defe4
...
...
@@ -2,43 +2,41 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 201
2-11-23
13:
56
+0100\n"
"PO-Revision-Date: 201
2-11-23
13:
56
+0100\n"
"POT-Creation-Date: 201
3-02-19
13:
11
+0100\n"
"PO-Revision-Date: 201
3-02-19
13:
11
+0100\n"
"Last-Translator: Université de Caen Basse Normandie\n"
"Language-Team: \n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Poedit-KeywordsList: translate;setLabel\n"
"X-Poedit-KeywordsList: translate;setLabel
;_
\n"
"X-Poedit-Basepath: .\n"
"X-Poedit-Language: French\n"
"X-Poedit-Country: FRANCE\n"
"X-Poedit-SourceCharset: utf-8\n"
"X-Poedit-SearchPath-0: ..\n"
"X-Poedit-SearchPath-1: ../../../zf-commons/zfc-user\n"
#: ../Module.php:20
0
#: ../Module.php:20
2
msgid "Sign In"
msgstr "Se connecter"
#: ../Module.php:20
1
#: ../Module.php:20
3
msgid "Username"
msgstr "Identifiant"
#: ../Module.php:20
2
#: ../Module.php:20
4
msgid "Password"
msgstr "Mot de passe"
#: ../src/UnicaenAuth/View/Helper/UserStatus.php:96
#: ../src/UnicaenAuth/View/Helper/UserProfile.php:65
#: ../src/UnicaenAuth/View/Helper/UserStatus.php:91
msgid "Erreur: identité inattendue"
msgstr "Error: unexpected identity"
#: ../src/UnicaenAuth/View/Helper/UserStatus.php:97
msgid "Aucun"
msgstr "Aucun"
#: ../src/UnicaenAuth/View/Helper/UserProfile.php:46
msgid "Profil"
msgstr "Profil"
#: ../src/UnicaenAuth/View/Helper/UserInfo.php:52
msgid "Affectations administratives"
msgstr "Affectations administratives"
...
...
@@ -59,6 +57,10 @@ msgstr "Aucune affectation trouvée."
msgid "Aucune affectation disponible."
msgstr "Aucune affectation disponible."
#: ../src/UnicaenAuth/View/Helper/UserCurrent.php:34
msgid "Utilisateur connecté : "
msgstr "Utilisateur connecté : "
#: ../src/UnicaenAuth/View/Helper/UserConnection.php:49
msgid "Connexion"
msgstr "Connexion"
...
...
@@ -75,31 +77,40 @@ msgstr "Déconnexion"
msgid "Ferme votre session au sein de cette application"
msgstr "Ferme votre session au sein de cette application"
#: ../../../zf-commons/zfc-user/src/ZfcUser/Form/Register.php:36
#: ../view/unicaen-user/user/register.phtml:1
msgid "Register"
#: ../config/module.config.php:147
msgid "Se connecter"
msgstr "Se connecter"
#: ../config/module.config.php:152
msgid "S'enregistrer"
msgstr "S'enregistrer"
#: ../
../../zf-commons/zfc-user/src/ZfcUser/Form/Base.php:80
msgid "
Submit
"
msgstr "
Valid
er"
#: ../
view/zfc-user/user/register.phtml:1
msgid "
Register
"
msgstr "
S'enregistr
er"
#: ../view/
unicaen
-user/user/register.phtml:5
#: ../view/
zfc
-user/user/register.phtml:5
msgid "Registration is disabled"
msgstr "L'enregistrement n'est pas disponible"
#: ../view/
unicaen
-user/user/login.phtml:31
#: ../view/
zfc
-user/user/login.phtml:31
msgid "Not registered?"
msgstr "Pas encore enregistré-e?"
#: ../view/
unicaen
-user/user/login.phtml:31
#: ../view/
zfc
-user/user/login.phtml:31
msgid "Sign up!"
msgstr "M'enregistrer!"
#: ../view/
unicaen
-user/user/index.phtml:2
#: ../view/
zfc
-user/user/index.phtml:2
msgid "Hello,"
msgstr "Bonjour,"
#~ msgid "Submit"
#~ msgstr "Valider"
#~ msgid "Profil"
#~ msgstr "Profil"
#~ msgid "Version"
#~ msgstr "Version"
...
...
src/UnicaenAuth/View/Helper/UserCurrent.php
View file @
d37defe4
...
...
@@ -29,9 +29,9 @@ class UserCurrent extends UserAbstract
* plus fine (ucbnSousStructure) si elle existe, à la place de l'affectation standard (niveau 2)
* @return UserCurrent
*/
public
function
__invoke
(
$legende
=
"Utilisateur connecté : "
,
$affectationFineSiDispo
=
false
)
public
function
__invoke
(
$legende
=
null
,
$affectationFineSiDispo
=
false
)
{
$this
->
setLegende
(
$legende
)
$this
->
setLegende
(
$legende
?:
_
(
"Utilisateur connecté : "
)
)
->
setAffectationFineSiDispo
(
$affectationFineSiDispo
);
return
$this
;
}
...
...
src/UnicaenAuth/View/Helper/UserStatus.php
View file @
d37defe4
...
...
@@ -88,7 +88,8 @@ class UserStatus extends UserAbstract
$name
=
$identity
->
getId
();
}
else
{
$name
=
sprintf
(
'<span title="Erreur: identité inattendue%s">???</span>'
,
$title
=
$this
->
getView
()
->
translate
(
"Erreur: identité inattendue"
);
$name
=
sprintf
(
'<span title="'
.
$title
.
'%s">???</span>'
,
is_object
(
$identity
)
?
" (classe "
.
get_class
(
$identity
)
.
")"
:
null
);
}
}
...
...
view/unicaen-auth/user/index.phtml
deleted
100644 → 0
View file @
1e76a5c8
<div
style=
"float:left; padding-right:16px;"
>
<?php
echo
$this
->
gravatar
(
$this
->
zfcUserIdentity
()
->
getEmail
())
?>
</div>
<h3>
<?php
echo
$this
->
translate
(
"Hello,"
);
?>
<?php
echo
$this
->
zfcUserDisplayName
()
?>
!
</h3>
<a
href=
"
<?php
echo
$this
->
url
(
'zfcuser/logout'
)
?>
"
>
[Sign Out]
</a>
<div
style=
"clear:both;"
></div>
view/unicaen-auth/user/login.phtml
deleted
100644 → 0
View file @
1e76a5c8
<h1>
<?php
echo
$this
->
translate
(
"Sign In"
);
?>
</h1>
<?php
$form
=
$this
->
loginForm
;
$form
->
prepare
();
$form
->
setAttribute
(
'action'
,
$this
->
url
(
'zfcuser/login'
));
$form
->
setAttribute
(
'method'
,
'post'
);
?>
<?php
echo
$this
->
form
()
->
openTag
(
$form
)
?>
<dl
class=
"zend_form"
>
<?php
echo
$this
->
formElementErrors
(
$form
->
get
(
'identity'
))
?>
<dt>
<?php
echo
$this
->
formLabel
(
$form
->
get
(
'identity'
))
?>
</dt>
<dd>
<?php
echo
$this
->
formInput
(
$form
->
get
(
'identity'
))
?>
</dd>
<dt>
<?php
echo
$this
->
formLabel
(
$form
->
get
(
'credential'
))
?>
</dt>
<dd>
<?php
echo
$this
->
formInput
(
$form
->
get
(
'credential'
))
?>
</dd>
<?php
if
(
$this
->
redirect
)
:
?>
<input
type=
"hidden"
name=
"redirect"
value=
"
<?php
echo
$this
->
redirect
?>
"
/>
<?php
endif
?>
<dd>
<?php
echo
$this
->
formButton
(
$form
->
get
(
'submit'
))
?>
</dd>
</dl>
<?php
echo
$this
->
form
()
->
closeTag
()
?>
<?php
if
(
$this
->
enableRegistration
)
:
?>
<?php
echo
$this
->
translate
(
"Not registered?"
);
?>
<a
href=
"
<?php
echo
$this
->
url
(
'zfcuser/register'
)
.
(
$this
->
redirect
?
'?redirect='
.
$this
->
redirect
:
''
)
?>
"
>
<?php
echo
$this
->
translate
(
"Sign up!"
);
?>
</a>
<?php
endif
;
?>
view/unicaen-auth/user/register.phtml
deleted
100644 → 0
View file @
1e76a5c8
<h1>
<?php
echo
$this
->
translate
(
"Register"
);
?>
</h1>
<?php
if
(
!
$this
->
enableRegistration
)
{
print
$this
->
translate
(
"Registration is disabled"
);
return
;
}
$form
=
$this
->
registerForm
;
$form
->
prepare
();
$form
->
setAttribute
(
'action'
,
$this
->
url
(
'zfcuser/register'
));
$form
->
setAttribute
(
'method'
,
'post'
);
?>
<?php
echo
$this
->
form
()
->
openTag
(
$form
)
?>
<dl
class=
"zend_form"
>
<?php
foreach
(
$form
as
$element
)
:
?>
<?php
if
(
!
$element
instanceof
Zend\Form\Element\Button
)
:
?>
<dt>
<?php
echo
$this
->
formLabel
(
$element
)
?>
</dt>
<?php
endif
?>
<?php
if
(
$element
instanceof
Zend\Form\Element\Button
)
:
?>
<dd>
<?php
echo
$this
->
formButton
(
$element
)
?>
</dd>
<?php
elseif
(
$element
instanceof
Zend\Form\Element\Captcha
)
:
?>
<dd>
<?php
echo
$this
->
formCaptcha
(
$element
)
.
$this
->
formElementErrors
(
$element
)
?>
</dd>
<?php
else
:
?>
<dd>
<?php
echo
$this
->
formInput
(
$element
)
.
$this
->
formElementErrors
(
$element
)
?>
</dd>
<?php
endif
?>
<?php
endforeach
?>
</dl>
<?php
if
(
$this
->
redirect
)
:
?>
<input
type=
"hidden"
name=
"redirect"
value=
"
<?php
echo
$this
->
redirect
?>
"
/>
<?php
endif
?>
<?php
echo
$this
->
form
()
->
closeTag
()
?>
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment