feature 1616: rename "category" into "album" (4th commit; almost there)
git-svn-id: http://piwigo.org/svn/trunk@6993 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices
parent
b472955f7d
commit
5ff171684e
73 changed files with 564 additions and 611 deletions
|
|
@ -190,7 +190,7 @@ SELECT id, name, id_uppercat
|
|||
|
||||
array_push(
|
||||
$page['infos'],
|
||||
l10n('Categories automatically sorted')
|
||||
l10n('Albums automatically sorted')
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -211,7 +211,7 @@ SELECT id,name,uppercats,global_rank
|
|||
;';
|
||||
$template->assign(
|
||||
array(
|
||||
'L_SECTION' => l10n('Select uploadable categories'),
|
||||
'L_SECTION' => l10n('Select uploadable albums'),
|
||||
'L_CAT_OPTIONS_TRUE' => l10n('Authorized'),
|
||||
'L_CAT_OPTIONS_FALSE' => l10n('Forbidden'),
|
||||
)
|
||||
|
|
@ -232,7 +232,7 @@ SELECT id,name,uppercats,global_rank
|
|||
;';
|
||||
$template->assign(
|
||||
array(
|
||||
'L_SECTION' => l10n('Authorize users to add comments on selected categories'),
|
||||
'L_SECTION' => l10n('Authorize users to add comments on selected albums'),
|
||||
'L_CAT_OPTIONS_TRUE' => l10n('Authorized'),
|
||||
'L_CAT_OPTIONS_FALSE' => l10n('Forbidden'),
|
||||
)
|
||||
|
|
@ -274,7 +274,7 @@ SELECT id,name,uppercats,global_rank
|
|||
;';
|
||||
$template->assign(
|
||||
array(
|
||||
'L_SECTION' => l10n('Manage authorizations for selected categories'),
|
||||
'L_SECTION' => l10n('Manage authorizations for selected albums'),
|
||||
'L_CAT_OPTIONS_TRUE' => l10n('Public'),
|
||||
'L_CAT_OPTIONS_FALSE' => l10n('Private'),
|
||||
)
|
||||
|
|
|
|||
|
|
@ -166,7 +166,7 @@ SELECT DISTINCT(image_id)
|
|||
}
|
||||
else if ('duplicates' == $_GET['cat'])
|
||||
{
|
||||
$page['title'] = l10n('Files with same name in more than one physical category');
|
||||
$page['title'] = l10n('Files with same name in more than one physical album');
|
||||
$template->assign(array('U_ACTIVE_MENU' => 5 ));
|
||||
|
||||
// we are searching related elements twice or more to physical categories
|
||||
|
|
|
|||
|
|
@ -1062,7 +1062,7 @@ SELECT uppercats
|
|||
{
|
||||
array_push(
|
||||
$page['errors'],
|
||||
l10n('You cannot move a album in its own sub album')
|
||||
l10n('You cannot move an album in its own sub album')
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -87,7 +87,7 @@ SELECT permalink
|
|||
{
|
||||
$page['errors'][] =
|
||||
sprintf(
|
||||
l10n('Permalink %s has been previously used by category %s. Delete from the permalink history first'),
|
||||
l10n('Permalink %s has been previously used by album %s. Delete from the permalink history first'),
|
||||
$permalink, $old_cat_id
|
||||
);
|
||||
return false;
|
||||
|
|
@ -156,7 +156,7 @@ function set_cat_permalink( $cat_id, $permalink, $save )
|
|||
{
|
||||
$page['errors'][] =
|
||||
sprintf(
|
||||
l10n('Permalink %s is already used by category %s'),
|
||||
l10n('Permalink %s is already used by album %s'),
|
||||
$permalink, $existing_cat_id
|
||||
);
|
||||
return false;
|
||||
|
|
@ -169,7 +169,7 @@ function set_cat_permalink( $cat_id, $permalink, $save )
|
|||
{
|
||||
$page['errors'][] =
|
||||
sprintf(
|
||||
l10n('Permalink %s has been previously used by category %s. Delete from the permalink history first'),
|
||||
l10n('Permalink %s has been previously used by album %s. Delete from the permalink history first'),
|
||||
$permalink, $old_cat_id
|
||||
);
|
||||
return false;
|
||||
|
|
|
|||
|
|
@ -161,7 +161,7 @@ array_push(
|
|||
array_push(
|
||||
$advanced_features,
|
||||
array(
|
||||
'CAPTION' => l10n('Files with same name in more than one physical category'),
|
||||
'CAPTION' => l10n('Files with same name in more than one physical album'),
|
||||
'URL' => get_root_url().'admin.php?page=element_set&cat=duplicates'
|
||||
)
|
||||
);
|
||||
|
|
|
|||
|
|
@ -112,7 +112,7 @@ if (isset($_GET['processed']))
|
|||
array_push(
|
||||
$page['infos'],
|
||||
sprintf(
|
||||
l10n('Category "%s" has been added'),
|
||||
l10n('Album "%s" has been added'),
|
||||
'<em>'.$category_name.'</em>'
|
||||
)
|
||||
);
|
||||
|
|
@ -346,7 +346,7 @@ SELECT
|
|||
array_push(
|
||||
$page['infos'],
|
||||
sprintf(
|
||||
l10n('Category "%s" now contains %d photos'),
|
||||
l10n('Album "%s" now contains %d photos'),
|
||||
'<em>'.$category_name.'</em>',
|
||||
$count
|
||||
)
|
||||
|
|
@ -457,7 +457,7 @@ if (pwg_db_num_rows($result) > 0)
|
|||
}
|
||||
}
|
||||
|
||||
// existing category
|
||||
// existing album
|
||||
$query = '
|
||||
SELECT id,name,uppercats,global_rank
|
||||
FROM '.CATEGORIES_TABLE.'
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ jQuery().ready(function(){ldelim}
|
|||
</dd>
|
||||
</dl>
|
||||
<dl>
|
||||
<dt class="rdion"><span>{'Categories'|@translate} </span></dt>
|
||||
<dt class="rdion"><span>{'Albums'|@translate} </span></dt>
|
||||
<dd>
|
||||
<ul>
|
||||
<li><a href="{$U_CATEGORIES}">{'Manage'|@translate}</a></li>
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
});
|
||||
</script>
|
||||
|
||||
<h2>{'Categories management'|@translate}</h2>
|
||||
<h2>{'Album list management'|@translate}</h2>
|
||||
|
||||
<h3>{$CATEGORIES_NAV}</h3>
|
||||
|
||||
|
|
@ -70,7 +70,7 @@
|
|||
{if cat_admin_access($category.ID)}
|
||||
<li><a href="{$category.U_JUMPTO}" title="{'jump to album'|@translate}"><img src="{$themeconf.admin_icon_dir}/category_jump-to.png" class="button" alt="{'jump to album'|@translate}"></a></li>
|
||||
{/if}
|
||||
<li><a href="{$category.U_EDIT}" title="{'edit category informations'|@translate}"><img src="{$themeconf.admin_icon_dir}/category_edit.png" class="button" alt="{'edit'|@translate}"></a></li>
|
||||
<li><a href="{$category.U_EDIT}" title="{'edit album'|@translate}"><img src="{$themeconf.admin_icon_dir}/category_edit.png" class="button" alt="{'edit'|@translate}"></a></li>
|
||||
{if isset($category.U_MANAGE_ELEMENTS) }
|
||||
<li><a href="{$category.U_MANAGE_ELEMENTS}" title="{'manage album elements'|@translate}"><img src="{$themeconf.admin_icon_dir}/category_elements.png" class="button" alt="{'elements'|@translate}"></a></li>
|
||||
{/if}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
{include file='include/resize.inc.tpl'}
|
||||
|
||||
<div class="titrePage">
|
||||
<h2>{'Edit a category'|@translate}</h2>
|
||||
<h2>{'Edit album'|@translate}</h2>
|
||||
</div>
|
||||
|
||||
<h3>{$CATEGORIES_NAV}</h3>
|
||||
|
|
@ -183,7 +183,7 @@
|
|||
|
||||
<table>
|
||||
<tr>
|
||||
<td>{'Categories'|@translate}</td>
|
||||
<td>{'Albums'|@translate}</td>
|
||||
<td>
|
||||
<select class="categoryList" name="destinations[]" multiple="multiple" size="5">
|
||||
{html_options options=$category_destination_options }
|
||||
|
|
|
|||
|
|
@ -356,7 +356,7 @@
|
|||
|
||||
<li>
|
||||
<label>
|
||||
<span class="property">{'Categories'|@translate}</span>
|
||||
<span class="property">{'Albums'|@translate}</span>
|
||||
<input type="checkbox" name="picture_informations[categories]" {if ($display.picture_informations.categories)}checked="checked"{/if}>
|
||||
</label>
|
||||
</li>
|
||||
|
|
|
|||
|
|
@ -5,4 +5,4 @@
|
|||
{$DOUBLE_SELECT}
|
||||
</form>
|
||||
|
||||
<p>{'Only private categories are listed'|@translate}</p>
|
||||
<p>{'Only private albums are listed'|@translate}</p>
|
||||
|
|
|
|||
|
|
@ -112,7 +112,7 @@
|
|||
<th>{'Element'|@translate}</th>
|
||||
<th>{'Element type'|@translate}</th>
|
||||
<th>{'Section'|@translate}</th>
|
||||
<th>{'Category'|@translate}</th>
|
||||
<th>{'Album'|@translate}</th>
|
||||
<th>{'Tags'|@translate}</th>
|
||||
</tr>
|
||||
{if !empty($search_results) }
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
<form method="post" action="">
|
||||
<fieldset><legend>{'Add/delete a permalink'|@translate}</legend>
|
||||
<label>{'Category'|@translate}:
|
||||
<label>{'Album'|@translate}:
|
||||
<select name="cat_id">
|
||||
<option value="0">------</option>
|
||||
{html_options options=$categories selected=$categories_selected}
|
||||
|
|
@ -29,7 +29,7 @@
|
|||
<table class="table2">
|
||||
<tr class="throw">
|
||||
<td>Id {$SORT_ID}</td>
|
||||
<td>{'Category'|@translate} {$SORT_NAME}</td>
|
||||
<td>{'Album'|@translate} {$SORT_NAME}</td>
|
||||
<td>{'Permalink'|@translate} {$SORT_PERMALINK}</td>
|
||||
</tr>
|
||||
{foreach from=$permalinks item=permalink name="permalink_loop"}
|
||||
|
|
@ -45,7 +45,7 @@
|
|||
<table class="table2">
|
||||
<tr class="throw">
|
||||
<td>Id {$SORT_OLD_CAT_ID}</td>
|
||||
<td>{'Category'|@translate}</td>
|
||||
<td>{'Album'|@translate}</td>
|
||||
<td>{'Permalink'|@translate} {$SORT_OLD_PERMALINK}</td>
|
||||
<td>{'Deleted on'|@translate} {$SORT_OLD_DATE_DELETED}</td>
|
||||
<td>{'Last hit'|@translate} {$SORT_OLD_LAST_HIT}</td>
|
||||
|
|
|
|||
|
|
@ -280,13 +280,13 @@ var sizeLimit = {$upload_max_filesize};
|
|||
|
||||
<form id="uploadForm" enctype="multipart/form-data" method="post" action="{$form_action}" class="properties">
|
||||
<fieldset>
|
||||
<legend>{'Drop into category'|@translate}</legend>
|
||||
<legend>{'Drop into album'|@translate}</legend>
|
||||
{if $upload_mode eq 'multiple'}
|
||||
<input name="upload_id" value="{$upload_id}" type="hidden">
|
||||
{/if}
|
||||
|
||||
<label><input type="radio" name="category_type" value="existing"> {'existing category'|@translate}</label>
|
||||
<label><input type="radio" name="category_type" value="new" checked="checked"> {'create a new category'|@translate}</label>
|
||||
<label><input type="radio" name="category_type" value="existing"> {'existing album'|@translate}</label>
|
||||
<label><input type="radio" name="category_type" value="new" checked="checked"> {'create a new album'|@translate}</label>
|
||||
|
||||
<div id="category_type_existing" style="display:none" class="category_selection">
|
||||
<select class="categoryDropDown" name="category">
|
||||
|
|
|
|||
|
|
@ -173,7 +173,7 @@
|
|||
|
||||
<form id="associations" method="post" action="{$F_ACTION}#associations">
|
||||
<fieldset>
|
||||
<legend>{'Association to categories'|@translate}</legend>
|
||||
<legend>{'Linked albums'|@translate}</legend>
|
||||
|
||||
<table class="doubleSelect">
|
||||
<tr>
|
||||
|
|
@ -200,7 +200,7 @@
|
|||
|
||||
<form id="representation" method="post" action="{$F_ACTION}#representation">
|
||||
<fieldset>
|
||||
<legend>{'Representation of categories'|@translate}</legend>
|
||||
<legend>{'Representation of albums'|@translate}</legend>
|
||||
|
||||
<table class="doubleSelect">
|
||||
<tr>
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@
|
|||
</tr>
|
||||
{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>
|
||||
<a href="{$site.NAME}">{$site.NAME}</a><br>({$site.TYPE}, {$site.CATEGORIES} {'Categories'|@translate}, {$pwg->l10n_dec('%d image','%d images',$site.IMAGES)})
|
||||
<a href="{$site.NAME}">{$site.NAME}</a><br>({$site.TYPE}, {$site.CATEGORIES} {'Albums'|@translate}, {$pwg->l10n_dec('%d image','%d images',$site.IMAGES)})
|
||||
</td><td>
|
||||
[<a href="{$site.U_SYNCHRONIZE}" title="{'update the database from files'|@translate}">{'synchronize'|@translate}</a>]
|
||||
{if isset($site.U_DELETE)}
|
||||
|
|
|
|||
|
|
@ -8,9 +8,9 @@
|
|||
{if isset($update_result)}
|
||||
<h3>{$L_RESULT_UPDATE}</h3>
|
||||
<ul>
|
||||
<li class="update_summary_new">{$update_result.NB_NEW_CATEGORIES} {'categories added in the database'|@translate}</li>
|
||||
<li class="update_summary_new">{$update_result.NB_NEW_CATEGORIES} {'albums added in the database'|@translate}</li>
|
||||
<li class="update_summary_new">{$update_result.NB_NEW_ELEMENTS} {'elements added in the database'|@translate}</li>
|
||||
<li class="update_summary_del">{$update_result.NB_DEL_CATEGORIES} {'categories deleted in the database'|@translate}</li>
|
||||
<li class="update_summary_del">{$update_result.NB_DEL_CATEGORIES} {'albums deleted in the database'|@translate}</li>
|
||||
<li class="update_summary_del">{$update_result.NB_DEL_ELEMENTS} {'elements deleted in the database'|@translate}</li>
|
||||
<li>{$update_result.NB_UPD_ELEMENTS} {'elements updated in the database'|@translate}</li>
|
||||
<li class="update_summary_err">{$update_result.NB_ERRORS} {'errors during synchronization'|@translate}</li>
|
||||
|
|
@ -67,7 +67,7 @@
|
|||
|
||||
<li><label><input type="radio" name="sync" value="files" {if 'files'==$introduction.sync}checked="checked"{/if}> {'directories + files'|@translate}</label>
|
||||
<ul style="padding-left:3em">
|
||||
<li><label><input type="checkbox" name="display_info" value="1" {if $introduction.display_info}checked="checked"{/if}> {'display maximum informations (added categories and elements, deleted categories and elements)'|@translate}</label></li>
|
||||
<li><label><input type="checkbox" name="display_info" value="1" {if $introduction.display_info}checked="checked"{/if}> {'display maximum informations (added albums and elements, deleted albums and elements)'|@translate}</label></li>
|
||||
<li><label><input type="checkbox" name="add_to_caddie" value="1" {if $introduction.add_to_caddie}checked="checked"{/if}> {'add new elements to caddie'|@translate}</label></li>
|
||||
<li><label>{'Who can see these photos?'|@translate} <select name="privacy_level">{html_options options=$introduction.privacy_level_options selected=$introduction.privacy_level_selected}</select></label></li>
|
||||
</ul>
|
||||
|
|
@ -94,7 +94,7 @@
|
|||
</fieldset>
|
||||
|
||||
<fieldset id="catSubset">
|
||||
<legend>{'reduce to single existing categories'|@translate}</legend>
|
||||
<legend>{'reduce to single existing albums'|@translate}</legend>
|
||||
<ul>
|
||||
<li>
|
||||
<select class="categoryList" name="cat" size="10">
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
<form action="{$F_ACTION}" method="post" id="waiting">
|
||||
<table style="width:99%;" >
|
||||
<tr class="throw">
|
||||
<td style="width:20%;">{'Category'|@translate}</td>
|
||||
<td style="width:20%;">{'Album'|@translate}</td>
|
||||
<td style="width:20%;">{'Date'|@translate}</td>
|
||||
<td style="width:20%;">{'File'|@translate}</td>
|
||||
<td style="width:20%;">{'Thumbnail'|@translate}</td>
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
{if isset($categories_because_of_groups) }
|
||||
<fieldset>
|
||||
<legend>{'Categories authorized thanks to group associations'|@translate}</legend>
|
||||
<legend>{'Albums authorized thanks to group associations'|@translate}</legend>
|
||||
|
||||
<ul>
|
||||
{foreach from=$categories_because_of_groups item=cat }
|
||||
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
|
||||
<fieldset>
|
||||
<legend>{'Other private categories'|@translate}</legend>
|
||||
<legend>{'Other private albums'|@translate}</legend>
|
||||
|
||||
<form method="post" action="{$F_ACTION}">
|
||||
{$DOUBLE_SELECT}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue