archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed missing keys in nbm

Browse source 
replace script must use language/templates files and not english

git-svn-id: http://piwigo.org/svn/trunk@5295 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
nikrou 2010-03-23 21:50:29 +00:00
commit ed6518319b
11 changed files with 17 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

4
language/de_DE/admin.lang.php
View file

@ -273,9 +273,7 @@ $lang['User'] = "Benutzer";
$lang['Complementary mail content'] = "Detaillierter Inhalt der Beachrichtigungsmail"; $lang['Complementary mail content'] = "Detaillierter Inhalt der Beachrichtigungsmail";
$lang['See you soon,'] = "Bis bald,"; $lang['See you soon,'] = "Bis bald,";
$lang['Go to'] = "Gehe zu"; $lang['Go to'] = "Gehe zu";
$lang['.'] = ".";
$lang['Hello'] = "Hallo"; $lang['Hello'] = "Hallo";
$lang[','] = ",";
$lang['New elements were added'] = "Neue Bilder wurden der Galerie hinzugefügt zwischen dem"; $lang['New elements were added'] = "Neue Bilder wurden der Galerie hinzugefügt zwischen dem";
$lang['on'] = "an"; $lang['on'] = "an";
$lang['between'] = "zwischen"; $lang['between'] = "zwischen";
@ -287,7 +285,7 @@ $lang['If you encounter problems or have any question, please send a message to'
$lang['[NBM] Problems or questions'] = "[NBM] Probleme oder Fragen"; $lang['[NBM] Problems or questions'] = "[NBM] Probleme oder Fragen";
$lang['The webmaster has unsubscribed you from receiving notifications by mail.'] = "Der Webmaster hat dich für die E-Mailbenachrichtigung ausgetragen"; $lang['The webmaster has unsubscribed you from receiving notifications by mail.'] = "Der Webmaster hat dich für die E-Mailbenachrichtigung ausgetragen";
$lang['You have unsubscribed from receiving notifications by mail.'] = "Sie haben sich ausgetragen für die Benachrichtigung per E-Mail"; $lang['You have unsubscribed from receiving notifications by mail.'] = "Sie haben sich ausgetragen für die Benachrichtigung per E-Mail";
$lang[', click on'] = ", klicke auf diesen Link:"; $lang[', click on '] = ", klicke auf diesen Link:";
$lang['To unsubscribe'] = "Zum austragen"; $lang['To unsubscribe'] = "Zum austragen";
$lang['With blank value, gallery title will be used'] = "Bei leerem Inhalt wird der Galerietitel benutzt"; $lang['With blank value, gallery title will be used'] = "Bei leerem Inhalt wird der Galerietitel benutzt";
$lang['Notification'] = "Benachrichtigung"; $lang['Notification'] = "Benachrichtigung";

2
language/en_UK/admin.lang.php
View file

@ -272,9 +272,7 @@ $lang['User'] = "User";
$lang['Complementary mail content'] = "Complementary mail content"; $lang['Complementary mail content'] = "Complementary mail content";
$lang['See you soon,'] = "See you soon,"; $lang['See you soon,'] = "See you soon,";
$lang['Go to'] = "Go to"; $lang['Go to'] = "Go to";
$lang['.'] = ".";
$lang['Hello'] = "Hello"; $lang['Hello'] = "Hello";
$lang[','] = ",";
$lang['New elements were added'] = "New elements were added"; $lang['New elements were added'] = "New elements were added";
$lang['on'] = "on"; $lang['on'] = "on";
$lang['between'] = "between"; $lang['between'] = "between";

2
language/es_ES/admin.lang.php
View file

@ -273,9 +273,7 @@ $lang['User'] = "Usuario";
$lang['Complementary mail content'] = "Contenido complementario en el mail"; $lang['Complementary mail content'] = "Contenido complementario en el mail";
$lang['See you soon,'] = "Hasta pronto,"; $lang['See you soon,'] = "Hasta pronto,";
$lang['Go to'] = "Vayan a"; $lang['Go to'] = "Vayan a";
$lang['.'] = ".";
$lang['Hello'] = "Buenos días"; $lang['Hello'] = "Buenos días";
$lang[','] = ",";
$lang['New elements were added'] = "Los nuevos elementos han sido añadidos"; $lang['New elements were added'] = "Los nuevos elementos han sido añadidos";
$lang['on'] = "el"; $lang['on'] = "el";
$lang['between'] = "entre él"; $lang['between'] = "entre él";

2
language/fr_FR/admin.lang.php
View file

@ -273,9 +273,7 @@ $lang['User'] = "Utilisateur";
$lang['Complementary mail content'] = "Contenu complémentaire au mail"; $lang['Complementary mail content'] = "Contenu complémentaire au mail";
$lang['See you soon,'] = "A bientôt,"; $lang['See you soon,'] = "A bientôt,";
$lang['Go to'] = "Rendez-vous sur"; $lang['Go to'] = "Rendez-vous sur";
$lang['.'] = ".";
$lang['Hello'] = "Bonjour"; $lang['Hello'] = "Bonjour";
$lang[','] = ",";
$lang['New elements were added'] = "De nouveaux éléments ont été ajoutés"; $lang['New elements were added'] = "De nouveaux éléments ont été ajoutés";
$lang['on'] = "le"; $lang['on'] = "le";
$lang['between'] = "entre le"; $lang['between'] = "entre le";

2
language/it_IT/admin.lang.php
View file

@ -273,9 +273,7 @@ $lang['User'] = "Utente";
$lang['Complementary mail content'] = "Contenuto complementare per l'email"; $lang['Complementary mail content'] = "Contenuto complementare per l'email";
$lang['See you soon,'] = "A presto,"; $lang['See you soon,'] = "A presto,";
$lang['Go to'] = "A presto su"; $lang['Go to'] = "A presto su";
$lang['.'] = ".";
$lang['Hello'] = "Ciao"; $lang['Hello'] = "Ciao";
$lang[','] = ",";
$lang['New elements were added'] = "Nuovi elementi sono stati aggiunti"; $lang['New elements were added'] = "Nuovi elementi sono stati aggiunti";
$lang['on'] = "il"; $lang['on'] = "il";
$lang['between'] = "tra il"; $lang['between'] = "tra il";

2
language/nl_NL/admin.lang.php
View file

@ -273,9 +273,7 @@ $lang['User'] = "Gebruiker";
$lang['Complementary mail content'] = "Inhoud mail"; $lang['Complementary mail content'] = "Inhoud mail";
$lang['See you soon,'] = "Zie je snel,"; $lang['See you soon,'] = "Zie je snel,";
$lang['Go to'] = "Ga naar"; $lang['Go to'] = "Ga naar";
$lang['.'] = "http://www.terwolde.net";
$lang['Hello'] = "Hallo"; $lang['Hello'] = "Hallo";
$lang[','] = ",";
$lang['New elements were added'] = "Nieuwe elementen toegevoegd"; $lang['New elements were added'] = "Nieuwe elementen toegevoegd";
$lang['on'] = "op"; $lang['on'] = "op";
$lang['between'] = "tussen"; $lang['between'] = "tussen";

2
language/pl_PL/admin.lang.php
View file

@ -273,9 +273,7 @@ $lang['User'] = "Użytkownik";
$lang['Complementary mail content'] = "Uzupełniająca treść wiadomości"; $lang['Complementary mail content'] = "Uzupełniająca treść wiadomości";
$lang['See you soon,'] = "Do zobaczenia wkrótce,"; $lang['See you soon,'] = "Do zobaczenia wkrótce,";
$lang['Go to'] = "Przejdź do"; $lang['Go to'] = "Przejdź do";
$lang['.'] = ".";
$lang['Hello'] = "Witaj"; $lang['Hello'] = "Witaj";
$lang[','] = ",";
$lang['New elements were added'] = "dodano nowe elementy"; $lang['New elements were added'] = "dodano nowe elementy";
$lang['on'] = "dnia"; $lang['on'] = "dnia";
$lang['between'] = "pomiędzy"; $lang['between'] = "pomiędzy";

2
language/templates/admin.lang.php
View file

@ -271,9 +271,7 @@ $lang['nbm_col_user'] = 'User';
$lang['nbm_complementary_mail_content'] = 'Complementary mail content'; $lang['nbm_complementary_mail_content'] = 'Complementary mail content';
$lang['nbm_content_byebye'] = 'See you soon,'; $lang['nbm_content_byebye'] = 'See you soon,';
$lang['nbm_content_goto_1'] = 'Go to '; $lang['nbm_content_goto_1'] = 'Go to ';
$lang['nbm_content_goto_2'] = '.';
$lang['nbm_content_hello_1'] = 'Hello '; $lang['nbm_content_hello_1'] = 'Hello ';
$lang['nbm_content_hello_2'] = ',';
$lang['nbm_content_new_elements'] = 'New elements were added '; $lang['nbm_content_new_elements'] = 'New elements were added ';
$lang['nbm_content_new_elements_single'] = ' on '; $lang['nbm_content_new_elements_single'] = ' on ';
$lang['nbm_content_new_elements_between_1'] = 'between '; $lang['nbm_content_new_elements_between_1'] = 'between ';

12
themes/default/template/mail/text/html/notification_by_mail.tpl
View file

@ -1,6 +1,6 @@
<div id="nbm_message"> <div id="nbm_message">
<h2>{'Notification'|@translate}</h2> <h2>{'Notification'|@translate}</h2>
<p>{'Hello '|@translate}{$USERNAME},</p> <p>{'Hello'|@translate} {$USERNAME},</p>
{if isset($subscribe_by_admin)} {if isset($subscribe_by_admin)}
<p>{'The webmaster has subscribed you to receiving notifications by mail.'|@translate}</p> <p>{'The webmaster has subscribed you to receiving notifications by mail.'|@translate}</p>
@ -15,10 +15,10 @@
<p>{'You have unsubscribed from receiving notifications by mail.'|@translate}</p> <p>{'You have unsubscribed from receiving notifications by mail.'|@translate}</p>
{/if} {/if}
{if isset($content_new_elements_single)} {if isset($content_new_elements_single)}
<p>{'New elements were added '|@translate}{' on '|@translate}{$content_new_elements_single.DATE_SINGLE}.</p> <p>{'New elements were added '|@translate} {'on'|@translate} {$content_new_elements_single.DATE_SINGLE}.</p>
{/if} {/if}
{if isset($content_new_elements_between)} {if isset($content_new_elements_between)}
<p>{'New elements were added '|@translate}{' between '|@translate}{$content_new_elements_between.DATE_BETWEEN_1}{' and '|@translate}{$content_new_elements_between.DATE_BETWEEN_2}.</p> <p>{'New elements were added '|@translate} {'between'|@translate} {$content_new_elements_between.DATE_BETWEEN_1} {'and'|@translate} {$content_new_elements_between.DATE_BETWEEN_2}.</p>
{/if} {/if}
{if not empty($global_new_lines)} {if not empty($global_new_lines)}
@ -34,14 +34,14 @@
{/if} {/if}
{if not empty($GOTO_GALLERY_TITLE)} {if not empty($GOTO_GALLERY_TITLE)}
<p>{'Go to '|@translate}<a href="{$GOTO_GALLERY_URL}">{$GOTO_GALLERY_TITLE}</a>.</p> <p>{'Go to'|@translate} <a href="{$GOTO_GALLERY_URL}">{$GOTO_GALLERY_TITLE}</a>.</p>
{/if} {/if}
<p>{'See you soon,'|@translate}</p> <p>{'See you soon,'|@translate}</p>
<p style="text-align:center">{$SEND_AS_NAME}</p> <p style="text-align:center">{$SEND_AS_NAME}</p>
<p> <p>
<br><hr> <br><hr>
{'To unsubscribe'|@translate}{', click on '|@translate}<a href="{$UNSUBSCRIBE_LINK}">{$UNSUBSCRIBE_LINK}</a><br> {'To unsubscribe'|@translate}{', click on'|@translate} <a href="{$UNSUBSCRIBE_LINK}">{$UNSUBSCRIBE_LINK}</a><br>
{'To subscribe '|@translate}{', click on '|@translate}<a href="{$SUBSCRIBE_LINK}">{$SUBSCRIBE_LINK}</a><br> {'To subscribe '|@translate}{', click on'|@translate} <a href="{$SUBSCRIBE_LINK}">{$SUBSCRIBE_LINK}</a><br>
{'If you encounter problems or have any question, please send a message to'|@translate} <a href="mailto:{$CONTACT_EMAIL}?subject={'[NBM] Problems or questions'|@translate}">{$CONTACT_EMAIL}</a><br> {'If you encounter problems or have any question, please send a message to'|@translate} <a href="mailto:{$CONTACT_EMAIL}?subject={'[NBM] Problems or questions'|@translate}">{$CONTACT_EMAIL}</a><br>
<hr><br> <hr><br>
</p> </p>

12
themes/default/template/mail/text/plain/notification_by_mail.tpl
View file

@ -1,4 +1,4 @@
{'Hello '|@translate}{$USERNAME}, {'Hello'|@translate} {$USERNAME},
{if isset($subscribe_by_admin)} {if isset($subscribe_by_admin)}
{'The webmaster has subscribed you to receiving notifications by mail.'|@translate} {'The webmaster has subscribed you to receiving notifications by mail.'|@translate}
@ -13,10 +13,10 @@
{'You have unsubscribed from receiving notifications by mail.'|@translate} {'You have unsubscribed from receiving notifications by mail.'|@translate}
{/if} {/if}
{if isset($content_new_elements_single)} {if isset($content_new_elements_single)}
{'New elements were added '|@translate}{' on '|@translate}{$content_new_elements_single.DATE_SINGLE}. {'New elements were added '|@translate} {'on'|@translate} {$content_new_elements_single.DATE_SINGLE}.
{/if} {/if}
{if isset($content_new_elements_between)} {if isset($content_new_elements_between)}
{'New elements were added '|@translate}{' between '|@translate}{$content_new_elements_between.DATE_BETWEEN_1}{' and '|@translate}{$content_new_elements_between.DATE_BETWEEN_2}. {'New elements were added '|@translate} {'between'|@translate} {$content_new_elements_between.DATE_BETWEEN_1} {'and'|@translate} {$content_new_elements_between.DATE_BETWEEN_2}.
{/if} {/if}
{if not empty($global_new_lines)} {if not empty($global_new_lines)}
{foreach from=$global_new_lines item=line} {foreach from=$global_new_lines item=line}
@ -27,7 +27,7 @@
{$custom_mail_content} {$custom_mail_content}
{/if} {/if}
{if not empty($GOTO_GALLERY_TITLE)} {if not empty($GOTO_GALLERY_TITLE)}
{'.'|@translate}{$GOTO_GALLERY_TITLE} {$GOTO_GALLERY_URL} {'.'|@translate} .{$GOTO_GALLERY_TITLE} {$GOTO_GALLERY_URL} .
{/if} {/if}
{'See you soon,'|@translate} {'See you soon,'|@translate}
@ -35,7 +35,7 @@
______________________________________________________________________________ ______________________________________________________________________________
{'To unsubscribe'|@translate}{', click on '|@translate}{$UNSUBSCRIBE_LINK} {'To unsubscribe'|@translate}{', click on'|@translate} {$UNSUBSCRIBE_LINK}
{'To subscribe'|@translate}{', click on '|@translate}{$SUBSCRIBE_LINK} {'To subscribe'|@translate}{', click on'|@translate} {$SUBSCRIBE_LINK}
{'If you encounter problems or have any question, please send a message to'|@translate} {$CONTACT_EMAIL} {'If you encounter problems or have any question, please send a message to'|@translate} {$CONTACT_EMAIL}
______________________________________________________________________________ ______________________________________________________________________________

8
tools/replace.php
View file

@ -18,10 +18,10 @@ $nbLines = count($lines);
$pattern = "`(.*{')(.*)('\|@translate}.*)`Um"; $pattern = "`(.*{')(.*)('\|@translate}.*)`Um";
$replace = "'{\''.keyReplace('\\1').'\'|@translate}'"; $replace = "'{\''.keyReplace('\\1').'\'|@translate}'";
include "language/en_UK/common.lang.php"; include "language/templates/common.lang.php";
include "language/en_UK/admin.lang.php"; include "language/templates/admin.lang.php";
include "language/en_UK/upgrade.lang.php"; include "language/templates/upgrade.lang.php";
include "language/en_UK/install.lang.php"; include "language/templates/install.lang.php";
while ($n < $nbLines) { while ($n < $nbLines) {
preg_match_all($pattern, $lines[$n], $matches); preg_match_all($pattern, $lines[$n], $matches);