- upload.tpl goes smarty

- start some language cleanup and a small attempt to standardize a bit ...
- debug_language now calls trigger_error instead of echo when missing language key

git-svn-id: http://piwigo.org/svn/trunk@2265 68402e56-0260-453c-a942-63ccdbb3a9ee

4 files changed, 53 insertions, 53 deletions

diff --git a/template/yoga/menubar.tpl b/template/yoga/menubar.tpl
index a7e01fcad..7169ff39f 100644
--- a/template/yoga/menubar.tpl
+++ b/template/yoga/menubar.tpl
@@ -36,7 +36,7 @@
     <a href="{$U_UPLOAD}">{'upload_picture'|@translate}</a>
   </li></ul>
   {/if}
-		<p class="totalImages">{$NB_PICTURE} {'total'|@translate}</p>
+		<p class="totalImages">{$pwg->l10n_dec('%d element', '%d elements', $NB_PICTURE)}</p>
   </dd>
 </dl>
 
@@ -50,12 +50,12 @@
 		<li>
 		{if !empty($tag.add) }
 			<a href="{$tag.add.URL}" 
-				title="{$pwg->l10n_dec('%d picture are also linked to current tags', '%d pictures are also linked to current tags', $tag.add.COUNTER)}" 
+				title="{$pwg->l10n_dec('%d element are also linked to current tags', '%d elements are also linked to current tags', $tag.add.COUNTER)}"
 				rel="nofollow">
 				<img src="{$ROOT_URL}{$themeconf.icon_dir}/add_tag.png" alt="+" />
 			</a>
 		{/if}
-		<a href="{$tag.U_TAG}" class="{$tag.CLASS}" title="{'See pictures linked to this tag only'|@translate}">{$tag.NAME}</a>
+		<a href="{$tag.U_TAG}" class="{$tag.CLASS}" title="{'See elements linked to this tag only'|@translate}">{$tag.NAME}</a>
 		</li>
 		{/foreach}
 		</ul>
@@ -146,7 +146,7 @@
 		</label>
 		{/if}
 		<p>
-		 <input class="submit" type="submit" name="login" value="{'submit'|@translate}">
+		 <input class="submit" type="submit" name="login" value="{'Submit'|@translate}">
 		</p>
 		
 		<ul class="actions">
diff --git a/template/yoga/month_calendar.tpl b/template/yoga/month_calendar.tpl
index a965d40e1..34f035915 100644
--- a/template/yoga/month_calendar.tpl
+++ b/template/yoga/month_calendar.tpl
@@ -46,7 +46,7 @@
 	 			<div class="calBackDate">{$day.DAY}</div><div class="calForeDate">{$day.DAY}</div>
 	 			<div class="calImg" style="width:{$chronology_calendar.month_view.CELL_WIDTH}px;height:{$chronology_calendar.month_view.CELL_HEIGHT}px;">
 					<a href="{$day.U_IMG_LINK}">
-			  			<img style="{$day.IMAGE_STYLE}" src="{$day.IMAGE}" alt="{$day.IMAGE_ALT}" title="{$day.IMAGE_ALT}" />
+			  			<img style="{$day.IMAGE_STYLE}" src="{$day.IMAGE}" alt="{$day.IMAGE_ALT}" title="{$pwg->l10n_dec('%d element','%d elements', $day.NB_ELEMENTS)}" />
 					</a>
 				</div>
  		{else}
diff --git a/template/yoga/picture.tpl b/template/yoga/picture.tpl
index e50c8cbb6..9e0d6fa2f 100644
--- a/template/yoga/picture.tpl
+++ b/template/yoga/picture.tpl
@@ -45,13 +45,13 @@
     {/if}
     {if isset($PLUGIN_PICTURE_ACTIONS)}{$PLUGIN_PICTURE_ACTIONS}{/if}
     {if isset($favorite) }
-      <a href="{$favorite.U_FAVORITE}" title="{$favorite.FAVORITE_HINT}"><img src="{$favorite.FAVORITE_IMG}" class="button" alt="{$favorite.FAVORITE_ALT}"></a>
+      <a href="{$favorite.U_FAVORITE}" title="{$favorite.FAVORITE_HINT}"><img src="{$favorite.FAVORITE_IMG}" class="button" alt="favorite" title="{$favorite.FAVORITE_HINT}"></a>
     {/if}
     {if !empty($U_SET_AS_REPRESENTATIVE) }
       <a href="{$U_SET_AS_REPRESENTATIVE}" title="{'set as category representative'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/representative.png" class="button" alt="{'representative'|@translate}"></a>
     {/if}
     {if isset($U_ADMIN) }
-      <a href="{$U_ADMIN}" title="{'link_info_image'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/preferences.png" class="button" alt="{'link_info_image'|@translate}"></a>
+      <a href="{$U_ADMIN}" title="{'link_info_image'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/preferences.png" class="button" alt="{'edit'|@translate}"></a>
     {/if}
     {if isset($U_CADDIE) }
       <a href="{$U_CADDIE}" title="{'add to caddie'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/caddie_add.png" class="button" alt="{'caddie'|@translate}"></a>
@@ -220,7 +220,7 @@
       {/if}
       <label>{'comment'|@translate}<textarea name="content" rows="5" cols="80">{$comment_add.CONTENT}</textarea></label>
       <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>
   </form>
   {/if}
diff --git a/template/yoga/upload.tpl b/template/yoga/upload.tpl
index 0f5edd7f2..1aad667e3 100644
--- a/template/yoga/upload.tpl
+++ b/template/yoga/upload.tpl
@@ -1,37 +1,37 @@
-<!-- DEV TAG: not smarty migrated -->
+{* $Id$ *}
+
 <div id="content">
 
   <div class="titrePage">
     <ul class="categoryActions">
-      <li><a href="{U_HOME}" title="{lang:return to homepage}"><img src="{themeconf:icon_dir}/home.png" class="button" alt="{lang:home}"/></a></li>
+      <li><a href="{$U_HOME}" title="{'return to homepage'|@translate}"><img src="{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}"/></a></li>
+    </ul>
+    <h2>{'upload_title'|@translate}</h2>
+  </div>
+
+  {if !empty($errors)}
+  <div class="errors">
+    <ul>
+      {foreach from=$errors item=error}
+      <li>{$error}</li>
+      {/foreach}
     </ul>
-    <h2>{lang:upload_title}</h2>
   </div>
+  {/if}
 
-  <!-- BEGIN upload_not_successful -->
-  <form enctype="multipart/form-data" method="post" action="{F_ACTION}">
+  {if not $UPLOAD_SUCCESSFUL }
+  <form enctype="multipart/form-data" method="post" action="{$F_ACTION}">
     <table style="width:80%;margin-left:auto;margin-right:auto;">
-    <!-- BEGIN errors -->
-        <tr>
-        <td colspan="2">
-          <div class="errors">
-          <ul>
-            <!-- BEGIN error -->
-            <li>{upload_not_successful.errors.error.ERROR}</li>
-            <!-- END error -->
-          </ul>
-          </div>
-        </td>
-        </tr>
-    <!-- END errors -->
     <tr>
       <td colspan="2" class="menu">
-      <div style="text-align:center;">{ADVISE_TITLE}</div>
+      <div style="text-align:center;">{$ADVISE_TITLE}</div>
+      {if not empty($advises)}
       <ul>
-        <!-- BEGIN advise -->
-        <li>{upload_not_successful.advise.ADVISE}</li>
-        <!-- END advise -->
+        {foreach from=$advises item=advise}
+        <li>{$advise}</li>
+        {/foreach}
       </ul>
+      {/if}
       </td>
     </tr>
     <tr>
@@ -39,65 +39,65 @@
       <input name="picture" type="file" value="" />
       </td>
     </tr>
-    <!-- BEGIN fields -->
+    {if isset($SHOW_FORM_FIELDS) and $SHOW_FORM_FIELDS}
     <!-- username  -->
     <tr>
-      <td class="menu">{lang:upload_username} <span style="color:red;">*</span></td>
+      <td class="menu">{'Username'|@translate} <span style="color:red;">*</span></td>
       <td align="left" style="padding:10px;">
-      <input name="username" type="text" value="{NAME}" />
+      <input name="username" type="text" value="{$NAME}" />
       </td>
     </tr>
     <!-- mail address  -->
     <tr>
-      <td class="menu">{lang:mail_address} <span style="color:red;">*</span></td>
+      <td class="menu">{'mail_address'|@translate} <span style="color:red;">*</span></td>
       <td align="left" style="padding:10px;">
-      <input name="mail_address" type="text" value="{EMAIL}" />
+      <input name="mail_address" type="text" value="{$EMAIL}" />
       </td>
     </tr>
     <!-- name of the picture  -->
     <tr>
-      <td class="menu">{lang:upload_name}</td>
+      <td class="menu">{'upload_name'|@translate}</td>
       <td align="left" style="padding:10px;">
-      <input name="name" type="text" value="{NAME_IMG}" />
+      <input name="name" type="text" value="{$NAME_IMG}" />
       </td>
     </tr>
     <!-- author  -->
     <tr>
-      <td class="menu">{lang:upload_author}</td>
+      <td class="menu">{'upload_author'|@translate}</td>
       <td align="left" style="padding:10px;">
-      <input name="author" type="text" value="{AUTHOR_IMG}" />
+      <input name="author" type="text" value="{$AUTHOR_IMG}" />
       </td>
     </tr>
     <!-- date of creation  -->
     <tr>
-      <td class="menu">{lang:upload_creation_date}</td>
+      <td class="menu">{'Creation date'|@translate} (DD/MM/YYYY)</td>
       <td align="left" style="padding:10px;">
-      <input name="date_creation" type="text" value="{DATE_IMG}" />
+      <input name="date_creation" type="text" value="{$DATE_IMG}" />
       </td>
     </tr>
     <!-- comment  -->
     <tr>
-      <td class="menu">{lang:comment}</td>
+      <td class="menu">{'comment'|@translate}</td>
       <td align="left" style="padding:10px;">
-       <textarea name="comment" rows="3" cols="40" style="overflow:auto">{COMMENT_IMG}</textarea>
+       <textarea name="comment" rows="3" cols="40" style="overflow:auto">{$COMMENT_IMG}</textarea>
       </td>
     </tr>
-    <!-- END fields -->
+    {/if}
     <tr>
       <td colspan="2" align="center">
-      <input class="submit" name="submit" type="submit" value="{lang:submit}" />
+      <input class="submit" name="submit" type="submit" value="{'Submit'|@translate}" />
       </td>
     </tr>
     </table>
   </form>
-  <!-- END upload_not_successful -->
-  <!-- BEGIN upload_successful -->
-  {lang:upload_successful}<br />
+  {else}
+  {'upload_successful'|@translate}<br />
   <div style="text-align:center;">
-    <a href="{U_RETURN}">[ {lang:home} ]</a>
+    <a href="{$U_RETURN}">[ {'home'|@translate} ]</a>
   </div>
-  <!-- END upload_successful -->
-  <!-- BEGIN note -->
-  <div style="text-align:left;"><span style="color:red;">*</span> : {lang:mandatory}</div>
-  <!-- END note -->
+  {/if}
+  
+  {if isset($SHOW_FORM_FIELDS) and $SHOW_FORM_FIELDS}
+  <div style="text-align:left;"><span style="color:red;">*</span> : {'mandatory'|@translate}</div>
+  {/if}
 </div> <!-- content -->