From ed6518319b2c5a6c7913b633a52f004663fe3242 Mon Sep 17 00:00:00 2001
From: nikrou <nikrou@piwigo.org>
Date: Tue, 23 Mar 2010 21:50:29 +0000
Subject: Fixed missing keys in nbm replace script must use language/templates
 files and not english

git-svn-id: http://piwigo.org/svn/trunk@5295 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 .../default/template/mail/text/html/notification_by_mail.tpl | 12 ++++++------
 .../template/mail/text/plain/notification_by_mail.tpl        | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'themes/default')

diff --git a/themes/default/template/mail/text/html/notification_by_mail.tpl b/themes/default/template/mail/text/html/notification_by_mail.tpl
index a5639417a..b8ccd8fc7 100644
--- a/themes/default/template/mail/text/html/notification_by_mail.tpl
+++ b/themes/default/template/mail/text/html/notification_by_mail.tpl
@@ -1,6 +1,6 @@
 <div id="nbm_message">
 <h2>{'Notification'|@translate}</h2>
-<p>{'Hello '|@translate}{$USERNAME},</p>
+<p>{'Hello'|@translate} {$USERNAME},</p>
 
 {if isset($subscribe_by_admin)}
 <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>
 {/if}
 {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 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 not empty($global_new_lines)}
@@ -34,14 +34,14 @@
 {/if}
 
 {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}
 <p>{'See you soon,'|@translate}</p>
 <p style="text-align:center">{$SEND_AS_NAME}</p>
 <p>
 <br><hr>
-{'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 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>
 {'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>
 </p>
diff --git a/themes/default/template/mail/text/plain/notification_by_mail.tpl b/themes/default/template/mail/text/plain/notification_by_mail.tpl
index 4c396ccf2..a428dce05 100644
--- a/themes/default/template/mail/text/plain/notification_by_mail.tpl
+++ b/themes/default/template/mail/text/plain/notification_by_mail.tpl
@@ -1,4 +1,4 @@
-{'Hello '|@translate}{$USERNAME},
+{'Hello'|@translate} {$USERNAME},
 
 {if isset($subscribe_by_admin)}
 {'The webmaster has subscribed you to receiving notifications by mail.'|@translate}
@@ -13,10 +13,10 @@
 {'You have unsubscribed from receiving notifications by mail.'|@translate}
 {/if}
 {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 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 not empty($global_new_lines)}
 {foreach from=$global_new_lines item=line}
@@ -27,7 +27,7 @@
 {$custom_mail_content}
 {/if}
 {if not empty($GOTO_GALLERY_TITLE)}
-{'.'|@translate}{$GOTO_GALLERY_TITLE} {$GOTO_GALLERY_URL} {'.'|@translate}
+.{$GOTO_GALLERY_TITLE} {$GOTO_GALLERY_URL} .
 {/if}
 
 {'See you soon,'|@translate}
@@ -35,7 +35,7 @@
 
 ______________________________________________________________________________
 
-{'To unsubscribe'|@translate}{', click on '|@translate}{$UNSUBSCRIBE_LINK}
-{'To subscribe'|@translate}{', click on '|@translate}{$SUBSCRIBE_LINK}
+{'To unsubscribe'|@translate}{', click on'|@translate} {$UNSUBSCRIBE_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}
 ______________________________________________________________________________
-- 
cgit v1.2.3