From 698eda739e705f5605711af927eb5e3720c7c97c Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Sat, 14 Feb 2015 12:35:22 +0100 Subject: [PATCH 1/1] mainly css improvements --- inc/poche/Poche.class.php | 4 +- inc/poche/config.inc.default.php | 2 +- locale/en_US.utf8/LC_MESSAGES/en_US.utf8.mo | Bin 17420 -> 17544 bytes locale/en_US.utf8/LC_MESSAGES/en_US.utf8.po | 15 +++++-- locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo | Bin 22813 -> 22961 bytes locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po | 14 ++++++- themes/baggy/login.twig | 10 ++--- themes/baggy/register.twig | 41 +++++++++++--------- 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 if ($email != "") { // if email is filled if (SEND_CONFIRMATION_EMAIL && function_exists('mail')) { - // if internal registration + // if internal registration from config screen $body_internal = _('Hi,') . "\r\n\r\n" . sprintf(_('Someone just created a wallabag account for you on %1$s.'), Tools::getPocheUrl()) . "\r\n\r\n" . sprintf(_('Your login is %1$s.'), $newUsername) ."\r\n\r\n" . _('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 $body = sprintf(_('Hi, %1$s'), $newUsername) . "\r\n\r\n" . sprintf(_('You\'ve just created a wallabag account on %1$s.'), Tools::getPocheUrl()) . "\r\n\r\n" . _("Have fun with it !"); + $body = $internalRegistration ? $body_internal : $body; $body = wordwrap($body, 70, "\r\n"); // cut lines with more than 70 caracters (MIME standard) @@ -105,6 +106,7 @@ class Poche "From: " . $newUsername . "@" . gethostname() . "\r\n")) { Tools::logm('The user ' . $newUsername . ' has been emailed'); $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)); + Tools::redirect('?'); } else { 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 @@ @define ('PDF', FALSE); // registration -@define ('SEND_CONFIRMATION_EMAIL', TRUE); // TO BE CHANGED DEPENDING ON POLL +@define ('SEND_CONFIRMATION_EMAIL', FALSE); @define ('ALLOW_REGISTER', TRUE); // 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 4341e50e33572f944c10a8ea0371781ae9b7edf7..f2c8a0f6f42813e30b15d85321de4be44908ebee 100644 GIT binary patch delta 4786 zcmaLZ2~btn9mny5q97@tplAfcLqSmi!G$0$xZx7AXoMsh&;mY{AmRc_1bk>H#f2tl ztQw7q#w{jdBr%H`LlQM94N{kx%*19oj!A9WhMG1y)5Yoc_wFI%OlNw=|NESC-@Rw~ zpK~8>uJx(i;N$r^#CMyaTq7cgPrDiu<73Q{KwYJT7~=~*SczS+KUQNb9>!tVhC|SV z8Z!@uVt3q#-EbHB<3aox9!DPWnA21ybD)%p$2S0P3#-gitnNZG`*eYgHi2X7{d4_no4JU81=vy)QqPf&zcM*RVEMl zXG-~Cai$JO<9_tR>!^Wmq9%L?^_=PBWHc1DfWfHi!_cD#CQ;GeXQEQH9JRM=F%l1> zj>ARNgV&J0%`I#|Ejt?aqZV)xNup`P8Tc(u!^FPE9KteG1|q}BKi`>zaA!r+QK`(q zU@Sl#zUNUZT#G4KgX-WMDs!!o)!uL&mGYam-EV-?aSZDIB-CDyN3A&1Ue7`G^BgJz zWysu&$F>`gjCsrvDmvxOs8jnTD#bTYE4zhCZEsGPQl5yK`E=C%Gf@M~MPJNC^|uh& zJyVHF{Vvq=$B{101$62C|BedVZyw-;#9=IIMOmm77NQ0!Lv^&?e!mUX(J^%4B^-=@ zLrtLXKxbk}sQy#X7qd_cn2Y|5Z}RLHg{WV!W%>fkQ5{vI9@vH2(*vm2w$ZkmQO|vW zy6;Q-{U1>M{D2zxU)TlBAkGJLMNcf1;Z#V1c^0|HRH0IJ7@x#*$eUzBxLH573CJsK z(oiX$i+W4SP=~J;HPCMCiu+L$KZ?5V9sB+HSn}VZNDT6SS*@1c+n&Zen_nO;W$iaws zXNGIA8|{tgk1wMJdKGmBUdPFJ7WH=ca8h+W9f~U4z=X7g3pP@K6b$ zauTcYEb13=64O)avQY!)V-PMweiDoaN8nye!Yjz5rVBqF{4*o@&;s132^FI^1E@^x zKy8Vqk%|U9jotAYYQ^8825d)laL=}V8BG}o#m+bob^j35gh!wTNJZT@3w4$jpfXW` z`bn-wKgKsLRC;jX3TnpRpdM^TrL@yv=5+C+>Sc5cTj({q8@gh z+k^9I{~a}v*^C;B`KT>iZQGR?O}idFeW;wGq7__1W#TK;KsPZ2|7@?{!*R6zn4LOK zM@@JRK8D9p6Z6e`6ZpuQ8H?UkD?|v2h~r${eBf{?>D0hJ#SG_YA>TE@E_F7 zdQNa&uW-}^Q&6cNhsszw>iXjtfU{B8=b`#pgt~t%D)lv}*LI6-zlKcEV@^=fjUS+H z_!!mERn!2#N2T@##^Eg-jJ+m0Z$}yqqU}a)O&vaghfsgC?qGKendJP@8i2~&cnsG2 zpG`%FZwYFkDpUq)P&2PXy-qvr_eZgjb|Y#+^Z7&YAZ|u}BFrIFe_!EHY{ys(pW^&< zPeE3I8;IfIHL@lwE_!XgT7(%FMD?17a_HNmW zxX5073?J2W7f^Ybc-MX*T8VDNIpQQyK|Dg}Ao&q9iH>rG$}-!Sft!f;iD|?yh$><} zp^`~VBseN{AmJoXXRXP#Zh@EQKvJ!o5eM`qh{5A0w@f&;XBJLxS zZTq*FL-e=pJp97e2P*&kwKP8`T!f0=O_k4xG;huMcp4IHdlXJ5E)gS%Kq8D#`M|*( z!{fHDAEF52Z9+fitBIwAci>1>D5o8~|FeCbdNr|~$R%bGWkfvjB#}sz5}OH?9mHN@ z46&YwBUGN+S|1o1e}UR)Z`=9!-F+f};Ky~4FR zccm+Tg*&&zy&z$0a_H2i+R)oU;U+IPztB}u>{?u0C#qo^|Q&6NjGLvj?)Bm@(v18l({tHt6^+f;x delta 4679 zcmY+_4^&q59mnx6@*u?Ukp~bBlz$36qJV!u6#oSYLTL@eM&V}K6cfqHT$+C#GsC~R zl3_Ui5L;=v8WwY56H9FiBu&dRZO)Es?P%?6#~rs$2dlI9hkH4P?%~7h_q)%1?*09~ z_jm8JX>-uFO+kTAqdfJ-cAg9-NBf$^2bs<3r@dzFJ~Iz?;2J!GDL5m_%#TYk3mY&U z+wl&(fsvRSZFUP5V;GiU1Xd!41Z)wFAFyK;>Wdq3Ja*y$^u(BjU>tfe3Hh@u*J;R@ z>^{^5t1%o`;|AP_w_*e*V{Vp)8bAhmxxVGmNMuI|j>U&?H15Sr{18Xscc__U#X19; zfXVcyB7ZiIf11b&)CD)72DT41^Fyc!96?Q}U45=^XJ}9gyNtnj9rcC(qDK5J@@Jlb z&T;X`pJnoo$ypIjz)B3odenvYq6XZII{y)54)y_R0H0w%A6%oMFWf|}fqsLW5~ZW= zaW1Mt51^LCI@I^JBVVy5Y{DZr3@e$wCa?~5!Od8LjW`{@!2LKnj{2)47vr3gT}90( zDBdY$EcU0Lf?9-QP&3TM@i-Or{S~OnZA5*4E9&?cu^eB<3D||Hn9VHj!utnPf0cMY zJG6RV$JKZd^~Kpk%ogH7)IfX*W~@s~MwKuJRe_19wK5ASf~`lbh25x196(*?5UO%- zx%*EAXymcuW7LVg)L9o!K`pu`FdtvRLi`f7I7cO!)!=+A#j~gZq_84)U@7W+pQ8ry zHR{%Rcy{%;MxiDgD4?N|)}S7XEB|{z=q{I#I`6K;7HVQ8Vmv_XiJkE)9oU8{@t;ux{Wt3PuTU4ziqpLgMLi`E z$lbD`s8Z*nzF&@f#gT3Horh+pj`> zZyD;iweIJ&s9Vy2x^NSQ;C>u|uc03=Vt~n7&~4p=vNTkwW?~sGK%N+DMZH?jBTuOP z165+3MNdTnYO!UaE>wVhu^2V*dr-$!x}R5LGyO;X)L*4frheUv0<-B?p-#95wMq{m z*R)H>gJQw#)GbOuRVoWhgLo67X57Fu*Wg}cU0OUB;hHuDwfd`&L+yo;)W3kn33h0N zAsNm+AAn)>6EOn)s5Ov-no%*{f#s;Dqye=y&Y>!B74>5J7slW>u0B?_Zebd#qT>TJ z!fBM?1}sP3j`j(vgf~zF=t3`sGJIYE7K>wX9FE4t$RV}|_1@^jTkspyfcmmim59LZ zilHVFD59YYmSH3=LCt&(>VmbX6V$u?-Ka_ (Yg9e*4(;8UmzoI@RV4Yj6jqAC&1 zX!R=gW2m10`80g&Sd1F+YSb5NQ6=4l8bC8@O&mracAy@wOQ;Hcjk?DnW1M$G*b-)}f!DTod+we^cVP&c!t*DBeg&#>RT!h^znX?t?K&*SXHX^j3#MYsIOo?Y4^`q?)arc}^<&kF z`d&`1*<9R$8pxLzja{e;dKrcKF{sDhkAXonX423M7NRQg80tc+FbdbZ`|EKs{e7qt z{S|fL>o^k&8MOvhhlO|yxhv-37p?}!A&1&asKt6YkNWSR5i!v@VIyiFEvS3<4zhsl zH0s3PqDtzYWfx=<%OG~-WDkI5Cc zAIx+I(GSO19Ew_`d8m?3L(Sw)9EdAjpGO_{s%s1C{B5XP{T}Lk9RV6cXk0;+`a9H# zd{dl(498^pGf>Apj2XBMHKVstGdzpB;APZ#uDYLhq3(6$ROiPk2UW>?Q3D7(MMEQN zz`@vv8sSk?X^*2y*5U5|2*c@LaQAw(U3eaczhBgaVN&%0aWEqpq`2=sKt97 zL-hQ6_yJG_!cmLHhdOWwY9JZdjAKy)`a9l=k^BH;V>;@Db8!SNLq9fRBDSM$(KS@1 z{)a)R?N404dt1-{t>hJ_YY({o&{b6RYWHrctlEA~4tBSkd+avt7>#$xP%@LK8mq`O z66nJ}Z7-6C)Nr>W_^{hviadGW+kQ!}p3EW7kTs-dV}jk=Z~3o^yhTb#J5lAbh_)Er z|L)S$Swv0|-9z3F)0qSd7V5-en);q#*j?n zC%w0FI@BCAH)n=_Ik_J<>=9k-g+?vX5xnK%z-D znM(dZTK+SlBB-t+I<{_ebW!-c2dk4FU&`MjEvKVzc*E3Lw6tbH%cYd3!|PUN6!toz Y?sRlni#KztH=@A(TCt97opd(z|GJ&da{vGU 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" msgid "Return home" msgstr "Return home" -msgid "Back to top" -msgstr "Back to top" +msgid "back" +msgstr "back" msgid "Mark as read" msgstr "Mark as read" @@ -435,6 +435,9 @@ msgstr "Save a Link" msgid "back to home" msgstr "Back to Home" +msgid "back to login" +msgstr "back to login" + msgid "toggle mark as read" msgstr "Toggle mark as read" @@ -705,8 +708,12 @@ msgstr "" "The new user %1$s has been sent an email at %2$s. You may have to check spam " "folder." -msgid "A problem has been encountered while sending the confirmation email" -msgstr "A problem has been encountered while sending an confirmation email" +msgid "" +"A problem has been encountered while sending the confirmation email, but the " +"user was created." +msgstr "" +"A problem has been encountered while sending an confirmation email, but the " +"user was created." msgid "The server did not authorize sending a confirmation email" msgstr "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 1004c1a07d119063bafb8fb4b1f9e15ba045a168..1f1995b85b5f02d06a24d765e83555b7fce51f78 100644 GIT binary patch delta 5531 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 Ri7zPAb)|p7vecy&{ttayU5Wqz delta 5428 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 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" msgid "back to home" msgstr "retour à l'accueil" +msgid "back" +msgstr "retour" + msgid "favorites" msgstr "favoris" @@ -357,6 +360,9 @@ msgstr "Tweet" msgid "Email" msgstr "E-mail" +msgid "Email (not required)" +msgstr "E-mail (non requis)" + msgid "shaarli" msgstr "Shaarli" @@ -835,8 +841,12 @@ msgstr "" msgid "A problem has been encountered while sending the confirmation email" msgstr "Un problème a été rencontré lors de l'envoi de l'email de confirmation" -msgid "The server did not authorize sending a confirmation email" -msgstr "Le serveur n'autorise pas l'envoi d'un email de confirmation" +msgid "" +"The server did not authorize sending a confirmation email, but the user was " +"created." +msgstr "" +"Le serveur n'autorise pas l'envoi d'un email de confirmation, mais " +"l'utilisateur a été créé." msgid "" "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 @@
+ {% if constant('ALLOW_REGISTER') == 1 %} +
+ {% trans "Register" %} +
+ {% endif %} {% endif %} - {% if constant('ALLOW_REGISTER') == 1 %} -
- {% trans "Register" %} -
- {% endif %} {% 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 @@ {% extends "layout-login.twig" %} {% block content %} +

{% trans 'Add user' %}

- -
-
- - -
-
- - -
-
- - -
-
- -
-
-
+
+
+ + +
+
+ + +
+
+ + +
+
+ +
+
+ {% trans "Back" %} +
+
+ {% endblock %} \ No newline at end of file -- 2.41.0