aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rwxr-xr-xinc/poche/Poche.class.php4
-rwxr-xr-xinc/poche/config.inc.default.php2
-rw-r--r--locale/en_US.utf8/LC_MESSAGES/en_US.utf8.mobin17420 -> 17544 bytes
-rw-r--r--locale/en_US.utf8/LC_MESSAGES/en_US.utf8.po15
-rw-r--r--locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mobin22813 -> 22961 bytes
-rw-r--r--locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po14
-rw-r--r--themes/baggy/login.twig10
-rw-r--r--themes/baggy/register.twig41
8 files changed, 54 insertions, 32 deletions
diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index a91a3f8f..e37d7c6c 100755
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -85,7 +85,7 @@ class Poche
85 if ($email != "") { // if email is filled 85 if ($email != "") { // if email is filled
86 if (SEND_CONFIRMATION_EMAIL && function_exists('mail')) { 86 if (SEND_CONFIRMATION_EMAIL && function_exists('mail')) {
87 87
88 // if internal registration 88 // if internal registration from config screen
89 $body_internal = _('Hi,') . "\r\n\r\n" . sprintf(_('Someone just created a wallabag account for you on %1$s.'), Tools::getPocheUrl()) . 89 $body_internal = _('Hi,') . "\r\n\r\n" . sprintf(_('Someone just created a wallabag account for you on %1$s.'), Tools::getPocheUrl()) .
90 "\r\n\r\n" . sprintf(_('Your login is %1$s.'), $newUsername) ."\r\n\r\n" . 90 "\r\n\r\n" . sprintf(_('Your login is %1$s.'), $newUsername) ."\r\n\r\n" .
91 _('Note : The password has been chosen by the person who created your account. Get in touch with that person to know your password and change it as soon as possible') . "\r\n\r\n" . 91 _('Note : The password has been chosen by the person who created your account. Get in touch with that person to know your password and change it as soon as possible') . "\r\n\r\n" .
@@ -96,6 +96,7 @@ class Poche
96 $body = sprintf(_('Hi, %1$s'), $newUsername) . "\r\n\r\n" . 96 $body = sprintf(_('Hi, %1$s'), $newUsername) . "\r\n\r\n" .
97 sprintf(_('You\'ve just created a wallabag account on %1$s.'), Tools::getPocheUrl()) . 97 sprintf(_('You\'ve just created a wallabag account on %1$s.'), Tools::getPocheUrl()) .
98 "\r\n\r\n" . _("Have fun with it !"); 98 "\r\n\r\n" . _("Have fun with it !");
99
99 $body = $internalRegistration ? $body_internal : $body; 100 $body = $internalRegistration ? $body_internal : $body;
100 101
101 $body = wordwrap($body, 70, "\r\n"); // cut lines with more than 70 caracters (MIME standard) 102 $body = wordwrap($body, 70, "\r\n"); // cut lines with more than 70 caracters (MIME standard)
@@ -105,6 +106,7 @@ class Poche
105 "From: " . $newUsername . "@" . gethostname() . "\r\n")) { 106 "From: " . $newUsername . "@" . gethostname() . "\r\n")) {
106 Tools::logm('The user ' . $newUsername . ' has been emailed'); 107 Tools::logm('The user ' . $newUsername . ' has been emailed');
107 $this->messages->add('i', sprintf(_('The new user %1$s has been sent an email at %2$s. You may have to check spam folder.'), $newUsername, $email)); 108 $this->messages->add('i', sprintf(_('The new user %1$s has been sent an email at %2$s. You may have to check spam folder.'), $newUsername, $email));
109 Tools::redirect('?');
108 110
109 } else { 111 } else {
110 Tools::logm('A problem has been encountered while sending an email'); 112 Tools::logm('A problem has been encountered while sending an email');
diff --git a/inc/poche/config.inc.default.php b/inc/poche/config.inc.default.php
index 7c27856d..6750383e 100755
--- a/inc/poche/config.inc.default.php
+++ b/inc/poche/config.inc.default.php
@@ -60,7 +60,7 @@
60@define ('PDF', FALSE); 60@define ('PDF', FALSE);
61 61
62// registration 62// registration
63@define ('SEND_CONFIRMATION_EMAIL', TRUE); // TO BE CHANGED DEPENDING ON POLL 63@define ('SEND_CONFIRMATION_EMAIL', FALSE);
64@define ('ALLOW_REGISTER', TRUE); 64@define ('ALLOW_REGISTER', TRUE);
65 65
66// display or not print link in article view 66// display or not print link in article view
diff --git a/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.mo b/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.mo
index 4341e50e..f2c8a0f6 100644
--- a/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.mo
+++ b/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.mo
Binary files differ
diff --git a/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.po b/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.po
index 37d926f1..73589e20 100644
--- a/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.po
+++ b/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.po
@@ -369,8 +369,8 @@ msgstr "Mark all the entries as read"
369msgid "Return home" 369msgid "Return home"
370msgstr "Return home" 370msgstr "Return home"
371 371
372msgid "Back to top" 372msgid "back"
373msgstr "Back to top" 373msgstr "back"
374 374
375msgid "Mark as read" 375msgid "Mark as read"
376msgstr "Mark as read" 376msgstr "Mark as read"
@@ -435,6 +435,9 @@ msgstr "Save a Link"
435msgid "back to home" 435msgid "back to home"
436msgstr "Back to Home" 436msgstr "Back to Home"
437 437
438msgid "back to login"
439msgstr "back to login"
440
438msgid "toggle mark as read" 441msgid "toggle mark as read"
439msgstr "Toggle mark as read" 442msgstr "Toggle mark as read"
440 443
@@ -705,8 +708,12 @@ msgstr ""
705"The new user %1$s has been sent an email at %2$s. You may have to check spam " 708"The new user %1$s has been sent an email at %2$s. You may have to check spam "
706"folder." 709"folder."
707 710
708msgid "A problem has been encountered while sending the confirmation email" 711msgid ""
709msgstr "A problem has been encountered while sending an confirmation email" 712"A problem has been encountered while sending the confirmation email, but the "
713"user was created."
714msgstr ""
715"A problem has been encountered while sending an confirmation email, but the "
716"user was created."
710 717
711msgid "The server did not authorize sending a confirmation email" 718msgid "The server did not authorize sending a confirmation email"
712msgstr "The server did not authorize sending a confirmation email" 719msgstr "The server did not authorize sending a confirmation email"
diff --git a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo
index 1004c1a0..1f1995b8 100644
--- a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo
+++ b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo
Binary files differ
diff --git a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po
index e0ee574e..526a44a3 100644
--- a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po
+++ b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po
@@ -67,6 +67,9 @@ msgstr "Se connecter"
67msgid "back to home" 67msgid "back to home"
68msgstr "retour à l'accueil" 68msgstr "retour à l'accueil"
69 69
70msgid "back"
71msgstr "retour"
72
70msgid "favorites" 73msgid "favorites"
71msgstr "favoris" 74msgstr "favoris"
72 75
@@ -357,6 +360,9 @@ msgstr "Tweet"
357msgid "Email" 360msgid "Email"
358msgstr "E-mail" 361msgstr "E-mail"
359 362
363msgid "Email (not required)"
364msgstr "E-mail (non requis)"
365
360msgid "shaarli" 366msgid "shaarli"
361msgstr "Shaarli" 367msgstr "Shaarli"
362 368
@@ -835,8 +841,12 @@ msgstr ""
835msgid "A problem has been encountered while sending the confirmation email" 841msgid "A problem has been encountered while sending the confirmation email"
836msgstr "Un problème a été rencontré lors de l'envoi de l'email de confirmation" 842msgstr "Un problème a été rencontré lors de l'envoi de l'email de confirmation"
837 843
838msgid "The server did not authorize sending a confirmation email" 844msgid ""
839msgstr "Le serveur n'autorise pas l'envoi d'un email de confirmation" 845"The server did not authorize sending a confirmation email, but the user was "
846"created."
847msgstr ""
848"Le serveur n'autorise pas l'envoi d'un email de confirmation, mais "
849"l'utilisateur a été créé."
840 850
841msgid "" 851msgid ""
842"The user was created, but no email was sent because email was not filled in" 852"The user was created, but no email was sent because email was not filled in"
diff --git a/themes/baggy/login.twig b/themes/baggy/login.twig
index 7906cc20..d941ca93 100644
--- a/themes/baggy/login.twig
+++ b/themes/baggy/login.twig
@@ -26,14 +26,14 @@
26 <div class="row mts txtcenter"> 26 <div class="row mts txtcenter">
27 <button class="bouton" type="submit" tabindex="4">{% trans "Sign in" %}</button> 27 <button class="bouton" type="submit" tabindex="4">{% trans "Sign in" %}</button>
28 </div> 28 </div>
29 {% if constant('ALLOW_REGISTER') == 1 %}
30 <div class="register">
31 <a href="?registerform">{% trans "Register" %}</a>
32 </div>
33 {% endif %}
29 </fieldset> 34 </fieldset>
30 <input type="hidden" name="returnurl" value="{{ referer }}"> 35 <input type="hidden" name="returnurl" value="{{ referer }}">
31 <input type="hidden" name="token" value="{{ token }}"> 36 <input type="hidden" name="token" value="{{ token }}">
32 </form> 37 </form>
33 {% endif %} 38 {% endif %}
34 {% if constant('ALLOW_REGISTER') == 1 %}
35 <div class="register">
36 <a href="?registerform">{% trans "Register" %}</a>
37 </div>
38 {% endif %}
39{% endblock %} 39{% endblock %}
diff --git a/themes/baggy/register.twig b/themes/baggy/register.twig
index 5744a481..e2c56c73 100644
--- a/themes/baggy/register.twig
+++ b/themes/baggy/register.twig
@@ -1,25 +1,28 @@
1{% extends "layout-login.twig" %} 1{% extends "layout-login.twig" %}
2{% block content %} 2{% block content %}
3 3
4<form method="post" action="?register">
4<h2>{% trans 'Add user' %}</h2> 5<h2>{% trans 'Add user' %}</h2>
5 <form method="post" action="?register"> 6 <fieldset class="w500p">
6 <fieldset class="w500p"> 7 <div class="row">
7 <div class="row"> 8 <label class="col w150p" for="newusername">{% trans 'Login' %}</label>
8 <label class="col w150p" for="newusername">{% trans 'Login' %}</label> 9 <input class="col" type="text" id="newusername" name="newusername" placeholder="{% trans 'Login' %}" required>
9 <input class="col" type="text" id="newusername" name="newusername" placeholder="{% trans 'Login' %}" required> 10 </div>
10 </div> 11 <div class="row">
11 <div class="row"> 12 <label class="col w150p" for="password4newuser">{% trans "Password" %}</label>
12 <label class="col w150p" for="password4newuser">{% trans "Password" %}</label> 13 <input class="col" type="password" id="password4newuser" name="password4newuser" placeholder="{% trans 'Password' %}" required>
13 <input class="col" type="password" id="password4newuser" name="password4newuser" placeholder="{% trans 'Password' %}" required> 14 </div>
14 </div> 15 <div class="row">
15 <div class="row"> 16 <label class="col w150p" for="newuseremail">{% trans 'Email (not required)' %}</label>
16 <label class="col w150p" for="newuseremail">{% trans 'Email' %}</label> 17 <input class="col" type="email" id="newuseremail" name="newuseremail" placeholder="{% trans 'Email' %}">
17 <input class="col" type="email" id="newuseremail" name="newuseremail" placeholder="{% trans 'Email' %}"> 18 </div>
18 </div> 19 <div class="row mts txtcenter">
19 <div class="row mts txtcenter"> 20 <button type="submit">{% trans "Register" %}</button>
20 <button type="submit">{% trans "Register" %}</button> 21 </div>
21 </div> 22 <div class="register">
22 </fieldset> 23 <a href="?">{% trans "Back" %}</a>
23 </form> 24 </div>
25 </fieldset>
26</form>
24 27
25{% endblock %} \ No newline at end of file 28{% endblock %} \ No newline at end of file