-fix language keys problems

git-svn-id: http://piwigo.org/svn/trunk@5178 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices 2010-03-18 19:21:17 +00:00
parent 4f80b6095c
commit d158f116d2
15 changed files with 24 additions and 24 deletions

View file

@ -198,9 +198,9 @@ $template->assign(
'PHP_VERSION' => phpversion(), 'PHP_VERSION' => phpversion(),
'DB_ENGINE' => $conf['dblayer'], 'DB_ENGINE' => $conf['dblayer'],
'DB_VERSION' => $db_version, 'DB_VERSION' => $db_version,
'DB_ELEMENTS' => l10n_dec('%d element', '%d elements', $nb_elements), 'DB_ELEMENTS' => l10n_dec('%d image', '%d images', $nb_elements),
'DB_CATEGORIES' => 'DB_CATEGORIES' =>
l10n_dec('%d category including ', '%d categories including ', l10n_dec('%d category including', '%d categories including',
$nb_categories). $nb_categories).
l10n_dec('%d physical', '%d physical', l10n_dec('%d physical', '%d physical',
$nb_physical). $nb_physical).

View file

@ -36,7 +36,7 @@
{'Contact'|@translate} {'Contact'|@translate}
<a href="mailto:{$CONTACT_MAIL}?subject={'title_send_mail'|@translate|@escape:url}">{'Webmaster'|@translate}</a> <a href="mailto:{$CONTACT_MAIL}?subject={'A comment on your site'|@translate|@escape:url}">{'Webmaster'|@translate}</a>
</div> <!-- pageInfos --> </div> <!-- pageInfos -->
</div> <!-- footer --> </div> <!-- footer -->

View file

@ -69,7 +69,7 @@
</a> </a>
</li> </li>
<li> <li>
<a href="{$plugin.U_ACTION}&amp;action=delete" onclick="return confirm('{'plugins_confirm_delete'|@translate|@escape:'javascript'}');"> <a href="{$plugin.U_ACTION}&amp;action=delete" onclick="return confirm('{'Are you sure you want to delete this plugin?'|@translate|@escape:'javascript'}');">
<img src="{$themeconf.admin_icon_dir}/plug_delete.png" alt="{'Delete'|@translate}" title="{'Delete'|@translate}"> <img src="{$themeconf.admin_icon_dir}/plug_delete.png" alt="{'Delete'|@translate}" title="{'Delete'|@translate}">
</a> </a>
</li> </li>

View file

@ -38,7 +38,7 @@
</tr> </tr>
{foreach from=$sites item=site name=site} {foreach from=$sites item=site name=site}
<tr style="text-align:left" class="{if $smarty.foreach.site.index is odd}row1{else}row2{/if}"><td> <tr style="text-align:left" class="{if $smarty.foreach.site.index is odd}row1{else}row2{/if}"><td>
<a href="{$site.NAME}">{$site.NAME}</a><br>({$site.TYPE}, {$site.CATEGORIES} {'Categories'|@translate}, {$pwg->l10n_dec('%d element','%d elements',$site.IMAGES)}) <a href="{$site.NAME}">{$site.NAME}</a><br>({$site.TYPE}, {$site.CATEGORIES} {'Categories'|@translate}, {$pwg->l10n_dec('%d image','%d images',$site.IMAGES)})
</td><td> </td><td>
[<a href="{$site.U_SYNCHRONIZE}" title="{'synchronize'|@translate}">{'synchronize'|@translate}</a>] [<a href="{$site.U_SYNCHRONIZE}" title="{'synchronize'|@translate}">{'synchronize'|@translate}</a>]
{if isset($site.U_DELETE)} {if isset($site.U_DELETE)}

View file

@ -472,7 +472,7 @@ function get_display_images_count($cat_nb_images, $cat_count_images, $cat_count_
} }
//at least one image direct or indirect //at least one image direct or indirect
$display_text.= l10n_dec('%d element', '%d elements', $cat_count_images); $display_text.= l10n_dec('%d image', '%d images', $cat_count_images);
if ($cat_count_categories == 0 or $cat_nb_images == $cat_count_images) if ($cat_count_categories == 0 or $cat_nb_images == $cat_count_images)
{ {

View file

@ -512,9 +512,9 @@ function register_default_menubar_blocks( $menu_ref_arr )
$menu->register_block( new RegisteredBlock( 'mbLinks', 'Links', 'piwigo')); $menu->register_block( new RegisteredBlock( 'mbLinks', 'Links', 'piwigo'));
$menu->register_block( new RegisteredBlock( 'mbCategories', 'Categories', 'piwigo')); $menu->register_block( new RegisteredBlock( 'mbCategories', 'Categories', 'piwigo'));
$menu->register_block( new RegisteredBlock( 'mbTags', 'Related tags', 'piwigo')); $menu->register_block( new RegisteredBlock( 'mbTags', 'Related tags', 'piwigo'));
$menu->register_block( new RegisteredBlock( 'mbSpecials', 'special_categories', 'piwigo')); $menu->register_block( new RegisteredBlock( 'mbSpecials', 'Specials', 'piwigo'));
$menu->register_block( new RegisteredBlock( 'mbMenu', 'title_menu', 'piwigo')); $menu->register_block( new RegisteredBlock( 'mbMenu', 'Menu', 'piwigo'));
$menu->register_block( new RegisteredBlock( 'mbIdentification', 'identification', 'piwigo') ); $menu->register_block( new RegisteredBlock( 'mbIdentification', 'Identification', 'piwigo') );
} }
?> ?>

View file

@ -22,7 +22,7 @@
{/if} {/if}
{if isset($comment.U_EDIT) and !isset($comment.IN_EDIT)} {if isset($comment.U_EDIT) and !isset($comment.IN_EDIT)}
<li> <li>
<a class="editComment" href="{$comment.U_EDIT}#edit_comment" title="{'edit this comment'|@translate}"> <a class="editComment" href="{$comment.U_EDIT}#edit_comment" title="edit this comment">
<img src="{$ROOT_URL}{$themeconf.icon_dir}/edit.png" class="button" alt="[edit]"> <img src="{$ROOT_URL}{$themeconf.icon_dir}/edit.png" class="button" alt="[edit]">
</a> </a>
</li> </li>
@ -41,8 +41,8 @@
<a name="edit_comment"></a> <a name="edit_comment"></a>
<form method="post" action="{$comment.U_EDIT}" class="filter" id="editComment"> <form method="post" action="{$comment.U_EDIT}" class="filter" id="editComment">
<fieldset> <fieldset>
<legend>{'Edit a comment'|@translate}</legend> <legend>Edit a comment</legend>
<label>{'Comment'|@translate}<textarea name="content" id="contenteditid" rows="5" cols="80">{$Comment.CONTENT|@escape}</textarea></label> <label>{'Comment'|@translate}<textarea name="content" id="contenteditid" rows="5" cols="80">{$comment.CONTENT|@escape}</textarea></label>
<input type="hidden" name="key" value="{$comment.KEY}"> <input type="hidden" name="key" value="{$comment.KEY}">
<input type="hidden" name="image_id" value="{$comment.IMAGE_ID|@default:$current.id}"> <input type="hidden" name="image_id" value="{$comment.IMAGE_ID|@default:$current.id}">
<input class="submit" type="submit" value="{'Submit'|@translate}"> <input class="submit" type="submit" value="{'Submit'|@translate}">

View file

@ -15,7 +15,7 @@
{$VERSION} {$VERSION}
{if isset($CONTACT_MAIL)} {if isset($CONTACT_MAIL)}
- {'Contact'|@translate} - {'Contact'|@translate}
<a href="mailto:{$CONTACT_MAIL}?subject={'title_send_mail'|@translate|@escape:url}">{'Webmaster'|@translate}</a> <a href="mailto:{$CONTACT_MAIL}?subject={'A comment on your site'|@translate|@escape:url}">{'Webmaster'|@translate}</a>
{/if} {/if}

View file

@ -35,5 +35,5 @@
</li> </li>
</ul> </ul>
{/if} {/if}
<p class="totalImages">{$pwg->l10n_dec('%d element', '%d elements', $block->data.NB_PICTURE)}</p> <p class="totalImages">{$pwg->l10n_dec('%d image', '%d images', $block->data.NB_PICTURE)}</p>
</dd> </dd>

View file

@ -6,7 +6,7 @@
<input type="text" name="q" id="qsearchInput" onfocus="if (value==qsearch_prompt) value='';" onblur="if (value=='') value=qsearch_prompt;" style="width:90%"> <input type="text" name="q" id="qsearchInput" onfocus="if (value==qsearch_prompt) value='';" onblur="if (value=='') value=qsearch_prompt;" style="width:90%">
</p> </p>
</form> </form>
<script type="text/javascript">var qsearch_prompt="{'qsearch'|@translate|@escape:'javascript'}"; document.getElementById('qsearchInput').value=qsearch_prompt;</script> <script type="text/javascript">var qsearch_prompt="{'Quick search'|@translate|@escape:'javascript'}"; document.getElementById('qsearchInput').value=qsearch_prompt;</script>
{/if} {/if}
<ul> <ul>

View file

@ -5,7 +5,7 @@
<span> <span>
{if !empty($tag.U_ADD) } {if !empty($tag.U_ADD) }
<a href="{$tag.U_ADD}" <a href="{$tag.U_ADD}"
title="{$pwg->l10n_dec('%d element are also linked to current tags', '%d elements are also linked to current tags', $tag.counter)}" title="{$pwg->l10n_dec('%d image is also linked to current tags', '%d images are also linked to current tags', $tag.counter)}"
rel="nofollow"> rel="nofollow">
<img src="{$ROOT_URL}{$themeconf.icon_dir}/add_tag.png" alt="+"> <img src="{$ROOT_URL}{$themeconf.icon_dir}/add_tag.png" alt="+">
</a> </a>

View file

@ -12,7 +12,7 @@
&nbsp; &nbsp;
{else} {else}
{foreach from=$bar.items item=item} {foreach from=$bar.items item=item}
<span class="calItem{if !isset($item.URL)}Empty{/if}" {if isset($item.NB_IMAGES)}title="{$pwg->l10n_dec('%d element', '%d elements', $item.NB_IMAGES)}"{/if}> <span class="calItem{if !isset($item.URL)}Empty{/if}" {if isset($item.NB_IMAGES)}title="{$pwg->l10n_dec('%d image', '%d images', $item.NB_IMAGES)}"{/if}>
{if isset($item.URL)} {if isset($item.URL)}
<a href="{$item.URL}">{$item.LABEL}</a> <a href="{$item.URL}">{$item.LABEL}</a>
{else} {else}
@ -68,7 +68,7 @@ TABLE.calMonth TBODY TD, TABLE.calMonth TBODY TD DIV.calImg {ldelim}
<div class="calBackDate">{$day.DAY}</div><div class="calForeDate">{$day.DAY}</div> <div class="calBackDate">{$day.DAY}</div><div class="calForeDate">{$day.DAY}</div>
<div class="calImg"> <div class="calImg">
<a href="{$day.U_IMG_LINK}"> <a href="{$day.U_IMG_LINK}">
<img style="{$day.IMAGE_STYLE}" src="{$day.IMAGE}" alt="{$day.IMAGE_ALT}" title="{$pwg->l10n_dec('%d element','%d elements', $day.NB_ELEMENTS)}"> <img style="{$day.IMAGE_STYLE}" src="{$day.IMAGE}" alt="{$day.IMAGE_ALT}" title="{$pwg->l10n_dec('%d image','%d images', $day.NB_ELEMENTS)}">
</a> </a>
</div> </div>
{else} {else}

View file

@ -109,7 +109,7 @@ y.callService(
</a> </a>
{/if} {/if}
<table id="standard" class="infoTable" summary="{'Some info about this picture'|@translate}"> <table id="standard" class="infoTable" summary="Some info about this picture">
<tr id="Author"> <tr id="Author">
<td class="label">{'Author'|@translate}</td> <td class="label">{'Author'|@translate}</td>
<td class="value">{if isset($INFO_AUTHOR)}{$INFO_AUTHOR}{else}{'N/A'|@translate}{/if}</td> <td class="value">{if isset($INFO_AUTHOR)}{$INFO_AUTHOR}{else}{'N/A'|@translate}{/if}</td>
@ -177,7 +177,7 @@ y.callService(
{if isset($rating)} {if isset($rating)}
<tr id="rating"> <tr id="rating">
<td class="label"> <td class="label">
<span id="updateRate">{if isset($rating.USER_RATE)}{'Rate this picture'|@translate}{else}{'Rate this picture'|@translate}{/if}</span> <span id="updateRate">{if isset($rating.USER_RATE)}{'Update your rating'|@translate}{else}{'Rate this picture'|@translate}{/if}</span>
</td> </td>
<td class="value"> <td class="value">
<form action="{$rating.F_ACTION}" method="post" id="rateForm" style="margin:0;"> <form action="{$rating.F_ACTION}" method="post" id="rateForm" style="margin:0;">
@ -193,7 +193,7 @@ y.callService(
<script type="text/javascript" src="{$ROOT_URL}themes/default/js/rating.js"></script> <script type="text/javascript" src="{$ROOT_URL}themes/default/js/rating.js"></script>
<script type="text/javascript"> <script type="text/javascript">
makeNiceRatingForm( {ldelim}rootUrl: '{$ROOT_URL|@escape:"javascript"}', image_id: {$current.id}, makeNiceRatingForm( {ldelim}rootUrl: '{$ROOT_URL|@escape:"javascript"}', image_id: {$current.id},
updateRateText: "{'update_rate'|@translate|@escape:'javascript'}", updateRateElement: document.getElementById("updateRate"), updateRateText: "{'Update your rating'|@translate|@escape:'javascript'}", updateRateElement: document.getElementById("updateRate"),
ratingSummaryText: "{'%.2f (rated %d times, standard deviation = %.2f)'|@translate|@escape:'javascript'}", ratingSummaryElement: document.getElementById("ratingSummary") {rdelim} ); ratingSummaryText: "{'%.2f (rated %d times, standard deviation = %.2f)'|@translate|@escape:'javascript'}", ratingSummaryElement: document.getElementById("ratingSummary") {rdelim} );
</script> </script>
</div> </div>
@ -268,7 +268,7 @@ y.callService(
{if $comment_add.SHOW_AUTHOR} {if $comment_add.SHOW_AUTHOR}
<label>{'Author'|@translate}<input type="text" name="author"></label> <label>{'Author'|@translate}<input type="text" name="author"></label>
{/if} {/if}
<label>{'Comment'|@translate}<textarea name="content" id="contentid" rows="5" cols="80">{$Comment_add.CONTENT}</textarea></label> <label>{'Comment'|@translate}<textarea name="content" id="contentid" rows="5" cols="80">{$comment_add.CONTENT}</textarea></label>
<input type="hidden" name="key" value="{$comment_add.KEY}"> <input type="hidden" name="key" value="{$comment_add.KEY}">
<input class="submit" type="submit" value="{'Submit'|@translate}"> <input class="submit" type="submit" value="{'Submit'|@translate}">
</fieldset> </fieldset>

View file

@ -45,7 +45,7 @@
</label> </label>
<ul> <ul>
<li><label> <li><label>
<input type="radio" name="mode" value="AND" checked="checked">{'Search for all terms '|@translate} <input type="radio" name="mode" value="AND" checked="checked">{'Search for all terms'|@translate}
</label></li> </label></li>
<li><label> <li><label>
<input type="radio" name="mode" value="OR">{'Search for any terms'|@translate} <input type="radio" name="mode" value="OR">{'Search for any terms'|@translate}

View file

@ -35,7 +35,7 @@
{foreach from=$letter.tags item=tag} {foreach from=$letter.tags item=tag}
<tr class="tagLine"> <tr class="tagLine">
<td><a href="{$tag.URL}">{$tag.name}</a></td> <td><a href="{$tag.URL}">{$tag.name}</a></td>
<td class="nbEntries">{$pwg->l10n_dec('%d element', '%d elements', $tag.counter)}</td> <td class="nbEntries">{$pwg->l10n_dec('%d image', '%d images', $tag.counter)}</td>
</tr> </tr>
{/foreach} {/foreach}
</table> </table>