aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2008-10-16 00:53:15 +0000
committerrvelices <rv-github@modusoptimus.com>2008-10-16 00:53:15 +0000
commite9c0f98e1477434eec4e8b74c1ba1ca972dec2da (patch)
tree1fc5fd2343a88386ac0fd584fafc1bd4d14c4666
parentebc3c2e2f7d9408db7e5335d63fdd2a003c3d79a (diff)
merge r 2758 from branch 2.0 to trunk
git-svn-id: http://piwigo.org/svn/trunk@2759 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--language/de_DE/common.lang.php1
-rw-r--r--language/en_UK/common.lang.php1
-rw-r--r--language/es_ES/common.lang.php1
-rw-r--r--language/fr_FR/common.lang.php1
-rw-r--r--language/it_IT/common.lang.php1
-rw-r--r--language/nl_NL/common.lang.php1
-rw-r--r--picture.php3
-rw-r--r--template/yoga/picture.tpl6
-rw-r--r--template/yoga/slideshow.tpl2
9 files changed, 5 insertions, 12 deletions
diff --git a/language/de_DE/common.lang.php b/language/de_DE/common.lang.php
index 90b8bf700..843fd3999 100644
--- a/language/de_DE/common.lang.php
+++ b/language/de_DE/common.lang.php
@@ -160,7 +160,6 @@ $lang['comment_to_validate'] = 'Ein Administrator muss Ihren Kommentar zu validi
$lang['comment_user_exists'] = 'Dieser Benutzername ist bereits';
$lang['comments'] = 'Kommentare';
$lang['comments_add'] = 'Kommentar hinzufügen';
-$lang['comments_title'] = 'Kommentare von Benutzern';
$lang['created after %s (%s)'] = 'erstellt nach dem %s (%s)';
$lang['created before %s (%s)'] = 'erstellt vor dem %s (%s)';
$lang['created between %s (%s) and %s (%s)'] = 'erstellt von %s (%s) und das %s (%s)';
diff --git a/language/en_UK/common.lang.php b/language/en_UK/common.lang.php
index d19c88038..fc758f5b1 100644
--- a/language/en_UK/common.lang.php
+++ b/language/en_UK/common.lang.php
@@ -160,7 +160,6 @@ $lang['comment_to_validate'] = 'An administrator must authorize your comment bef
$lang['comment_user_exists'] = 'This login is already used by another user';
$lang['comments'] = 'Comments';
$lang['comments_add'] = 'Add a comment';
-$lang['comments_title'] = 'Comments from the users of the site';
$lang['created after %s (%s)'] = 'created after %s (%s)';
$lang['created before %s (%s)'] = 'created before %s (%s)';
$lang['created between %s (%s) and %s (%s)'] = 'created between %s (%s) and %s (%s)';
diff --git a/language/es_ES/common.lang.php b/language/es_ES/common.lang.php
index 987be68a7..dc3d21e23 100644
--- a/language/es_ES/common.lang.php
+++ b/language/es_ES/common.lang.php
@@ -160,7 +160,6 @@ $lang['comment_to_validate'] = 'El administrador debe activar su comentario para
$lang['comment_user_exists'] = 'Este nombre de usuario ya existe, pruebe otro';
$lang['comments'] = 'Comentarios';
$lang['comments_add'] = 'Agregar comentario';
-$lang['comments_title'] = 'Comentarios de usuarios';
$lang['created after %s (%s)'] = 'Creado después del %s (%s)';
$lang['created before %s (%s)'] = 'creado antes del %s (%s)';
$lang['created between %s (%s) and %s (%s)'] = 'creado entre el %s (%s) y el %s (%s)';
diff --git a/language/fr_FR/common.lang.php b/language/fr_FR/common.lang.php
index 5082f2719..51bf007b3 100644
--- a/language/fr_FR/common.lang.php
+++ b/language/fr_FR/common.lang.php
@@ -160,7 +160,6 @@ $lang['comment_to_validate'] = 'Un administrateur doit valider votre commentaire
$lang['comment_user_exists'] = 'Ce nom d\'utilisateur est déjà pris';
$lang['comments'] = 'Commentaires';
$lang['comments_add'] = 'Ajouter un commentaire';
-$lang['comments_title'] = 'Commentaires des utilisateurs';
$lang['created after %s (%s)'] = 'créée après le %s (%s)';
$lang['created before %s (%s)'] = 'créée avant le %s (%s)';
$lang['created between %s (%s) and %s (%s)'] = 'créée entre le %s (%s) et le %s (%s)';
diff --git a/language/it_IT/common.lang.php b/language/it_IT/common.lang.php
index 95344bc16..b6925871b 100644
--- a/language/it_IT/common.lang.php
+++ b/language/it_IT/common.lang.php
@@ -160,7 +160,6 @@ $lang['comment_to_validate'] = 'Un amministratore deve autorizzare il tuo commen
$lang['comment_user_exists'] = 'Questo nome utente esiste già';
$lang['comments'] = 'Commenti';
$lang['comments_add'] = 'Aggiunti un commento';
-$lang['comments_title'] = 'Commenti degli utenti';
$lang['created after %s (%s)'] = 'creata dopo il %s (%s)';
$lang['created before %s (%s)'] = 'creata prima del %s (%s)';
$lang['created between %s (%s) and %s (%s)'] = 'creata tra il %s (%s) e il %s (%s)';
diff --git a/language/nl_NL/common.lang.php b/language/nl_NL/common.lang.php
index 36f132852..35132b87d 100644
--- a/language/nl_NL/common.lang.php
+++ b/language/nl_NL/common.lang.php
@@ -160,7 +160,6 @@ $lang['comment_to_validate'] = 'Een beheerder moet je commentaar goedkeuren voor
$lang['comment_user_exists'] = 'Deze gebruikersnaam is al in gebruik';
$lang['comments'] = 'Commentaar';
$lang['comments_add'] = 'voeg commentaar toe';
-$lang['comments_title'] = 'Commentaar van gebruikers van deze website';
$lang['created after %s (%s)'] = 'Gemaakt na %s (%s)';
$lang['created before %s (%s)'] = 'Gemaakt voor %s (%s)';
$lang['created between %s (%s) and %s (%s)'] = 'Gemaakt tussen %s (%s) en %s (%s)';
diff --git a/picture.php b/picture.php
index f5e23f687..49e29d13d 100644
--- a/picture.php
+++ b/picture.php
@@ -686,11 +686,10 @@ $template->assign(
'SECTION_TITLE' => $page['title'],
'PHOTO' => $title_nb,
'SHOW_PICTURE_NAME_ON_TITLE' => $conf['show_picture_name_on_title'],
+ 'IS_HOME' => ('categories'==$page['section'] and !isset($page['category']) ),
'LEVEL_SEPARATOR' => $conf['level_separator'],
- 'FILE_PICTURE_NAV_BUTTONS' => 'picture_nav_buttons.tpl',
-
'U_HOME' => make_index_url(),
'U_UP' => $url_up,
'U_METADATA' => $url_metadata,
diff --git a/template/yoga/picture.tpl b/template/yoga/picture.tpl
index 6b5468fff..d6a99decf 100644
--- a/template/yoga/picture.tpl
+++ b/template/yoga/picture.tpl
@@ -28,7 +28,7 @@
<div id="imageHeaderBar">
<div class="browsePath">
<a href="{$U_HOME}" rel="home">{'home'|@translate}</a>
- {if $SECTION_TITLE != 'no_category'|@translate}{$LEVEL_SEPARATOR}{$SECTION_TITLE}{/if}
+ {if !$IS_HOME}{$LEVEL_SEPARATOR}{$SECTION_TITLE}{/if}
{$LEVEL_SEPARATOR}{$current.TITLE}
</div>
<div class="imageNumber">{$PHOTO}</div>
@@ -80,7 +80,7 @@ y.callService(
<a href="{$U_CADDIE}" onclick="addToCadie(this, '{$ROOT_URL|@escape:'javascript'}', {$current.id}); return false;" title="{'add to caddie'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/caddie_add.png" class="button" alt="{'caddie'|@translate}"></a>
{/if}{*caddie management END*}
</div>
- {include file=$FILE_PICTURE_NAV_BUTTONS}
+ {include file='picture_nav_buttons.tpl'|@get_extent:'picture_nav_buttons'}
</div> <!-- imageToolBar -->
<div id="theImage">
@@ -251,7 +251,7 @@ y.callService(
{if isset($COMMENT_COUNT)}
<div id="comments">
- <h3>[{$COMMENT_COUNT}] {'comments_title'|@translate}</h3>
+ <h3>{$pwg->l10n_dec('%d comment', '%d comments',$COMMENT_COUNT)}</h3>
{if !empty($COMMENT_NAV_BAR)}
<div class="navigationBar">{$COMMENT_NAV_BAR}</div>
diff --git a/template/yoga/slideshow.tpl b/template/yoga/slideshow.tpl
index 1bbc0029f..f429702e6 100644
--- a/template/yoga/slideshow.tpl
+++ b/template/yoga/slideshow.tpl
@@ -12,7 +12,7 @@
</div>
<div id="imageToolBar">
- {include file=$FILE_PICTURE_NAV_BUTTONS}
+ {include file='picture_nav_buttons.tpl'|@get_extent:'picture_nav_buttons'}
</div>
<div id="theImage">