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

Fix problem with white space in language keys

Browse source 
git-svn-id: http://piwigo.org/svn/trunk@5297 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
nikrou 2010-03-23 22:06:13 +00:00
commit c045205e53
4 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
admin/plugins_new.php
View file

@ -71,7 +71,7 @@ if (isset($_GET['installstatus']))
default:
array_push($page['errors'],
sprintf(l10n('An error occured during extraction (%s).'), $_GET['installstatus']),
l10n('Please check \"plugins\" folder and sub-folders permissions (CHMOD).'));
l10n('Please check "plugins" folder and sub-folders permissions (CHMOD).'));
}
}

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

@ -270,12 +270,12 @@ $lang['nbm_col_mail'] = 'email';
$lang['nbm_col_user'] = 'User';
$lang['nbm_complementary_mail_content'] = 'Complementary mail content';
$lang['nbm_content_byebye'] = 'See you soon,';
$lang['nbm_content_goto_1'] = 'Go to ';
$lang['nbm_content_hello_1'] = 'Hello ';
$lang['nbm_content_new_elements'] = 'New elements were added ';
$lang['nbm_content_new_elements_single'] = ' on ';
$lang['nbm_content_new_elements_between_1'] = 'between ';
$lang['nbm_content_new_elements_between_2'] = ' and ';
$lang['nbm_content_goto_1'] = 'Go to';
$lang['nbm_content_hello_1'] = 'Hello';
$lang['nbm_content_new_elements'] = 'New elements were added';
$lang['nbm_content_new_elements_single'] = 'on';
$lang['nbm_content_new_elements_between_1'] = 'between';
$lang['nbm_content_new_elements_between_2'] = 'and';
$lang['nbm_content_subscribe_by_admin'] = 'The webmaster has subscribed you to receiving notifications by mail.';
$lang['nbm_content_subscribe_by_himself'] = 'You have subscribed to receiving notifications by mail.';
$lang['nbm_content_subscribe_link'] = 'To subscribe';

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

@ -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)}
@ -41,7 +41,7 @@
<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 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>

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

@ -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}