Changeset 6993 for trunk/admin

Timestamp:

Sep 21, 2010, 11:14:54 PM (14 years ago)

Author:

rvelices

Message:

feature 1616: rename "category" into "album" (4th commit; almost there)

Location:

trunk/admin

Files:

• cat_list.php (modified) (1 diff)
• cat_options.php (modified) (3 diffs)
• element_set.php (modified) (1 diff)
• include/functions.php (modified) (1 diff)
• include/functions_permalinks.php (modified) (3 diffs)
• maintenance.php (modified) (1 diff)
• photos_add_direct.php (modified) (3 diffs)
• themes/default/template/admin.tpl (modified) (1 diff)
• themes/default/template/cat_list.tpl (modified) (2 diffs)
• themes/default/template/cat_modify.tpl (modified) (2 diffs)
• themes/default/template/configuration.tpl (modified) (1 diff)
• themes/default/template/group_perm.tpl (modified) (1 diff)
• themes/default/template/history.tpl (modified) (1 diff)
• themes/default/template/permalinks.tpl (modified) (3 diffs)
• themes/default/template/photos_add_direct.tpl (modified) (1 diff)
• themes/default/template/picture_modify.tpl (modified) (2 diffs)
• themes/default/template/site_manager.tpl (modified) (1 diff)
• themes/default/template/site_update.tpl (modified) (3 diffs)
• themes/default/template/upload.tpl (modified) (1 diff)
• themes/default/template/user_perm.tpl (modified) (2 diffs)

trunk/admin/cat_list.php

@@ -191 +191 @@
     array_push(
       $page['infos'],
-      l10n('Categories automatically sorted')
+      l10n('Albums automatically sorted')
       );
   }

trunk/admin/cat_options.php

@@ -212 +212 @@
     $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'),
@@ -233 +233 @@
     $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'),
@@ -275 +275 @@
     $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'),

trunk/admin/element_set.php

@@ -167 +167 @@
 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 ));
 

trunk/admin/include/functions.php

@@ -1063 +1063 @@
         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;

trunk/admin/include/functions_permalinks.php

@@ -88 +88 @@
       $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
         );
@@ -157 +157 @@
       $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 
         );
@@ -170 +170 @@
     $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
       );

trunk/admin/maintenance.php

@@ -162 +162 @@
   $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'
     )

trunk/admin/photos_add_direct.php

@@ -113 +113 @@
         $page['infos'],
         sprintf(
-          l10n('Category "%s" has been added'),
+          l10n('Album "%s" has been added'),
           '<em>'.$category_name.'</em>'
           )
@@ -347 +347 @@
         $page['infos'],
         sprintf(
-          l10n('Category "%s" now contains %d photos'),
+          l10n('Album "%s" now contains %d photos'),
           '<em>'.$category_name.'</em>',
           $count
@@ -458 +458 @@
 }
 
-// existing category
+// existing album
 $query = '
 SELECT id,name,uppercats,global_rank

trunk/admin/themes/default/template/admin.tpl

@@ -32 +32 @@
   </dl>
   <dl>
-    <dt class="rdion"><span>{'Categories'|@translate}&nbsp;</span></dt>
+    <dt class="rdion"><span>{'Albums'|@translate}&nbsp;</span></dt>
     <dd>
       <ul>

trunk/admin/themes/default/template/cat_list.tpl

@@ -29 +29 @@
 </script>
 
-<h2>{'Categories management'|@translate}</h2>
+<h2>{'Album list management'|@translate}</h2>
 
 <h3>{$CATEGORIES_NAV}</h3>
@@ -71 +71 @@
         <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>

trunk/admin/themes/default/template/cat_modify.tpl

@@ -4 +4 @@
 
 <div class="titrePage">
-  <h2>{'Edit a category'|@translate}</h2>
+  <h2>{'Edit album'|@translate}</h2>
 </div>
 
@@ -184 +184 @@
   <table>
     <tr>
-      <td>{'Categories'|@translate}</td>
+      <td>{'Albums'|@translate}</td>
       <td>
         <select class="categoryList" name="destinations[]" multiple="multiple" size="5">

trunk/admin/themes/default/template/configuration.tpl

@@ -357 +357 @@
     <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>

trunk/admin/themes/default/template/group_perm.tpl

@@ -6 +6 @@
 </form>
 
-<p>{'Only private categories are listed'|@translate}</p>
+<p>{'Only private albums are listed'|@translate}</p>

trunk/admin/themes/default/template/history.tpl

@@ -113 +113 @@
   <th>{'Element type'|@translate}</th>
   <th>{'Section'|@translate}</th>
-  <th>{'Category'|@translate}</th>
+  <th>{'Album'|@translate}</th>
   <th>{'Tags'|@translate}</th>
 </tr>

trunk/admin/themes/default/template/permalinks.tpl

@@ -5 +5 @@
 <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>
@@ -30 +30 @@
         <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>
@@ -46 +46 @@
         <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>

trunk/admin/themes/default/template/photos_add_direct.tpl

@@ -281 +281 @@
 <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">

trunk/admin/themes/default/template/picture_modify.tpl

@@ -174 +174 @@
 <form id="associations" method="post" action="{$F_ACTION}#associations">
   <fieldset>
-    <legend>{'Association to categories'|@translate}</legend>
+    <legend>{'Linked albums'|@translate}</legend>
 
     <table class="doubleSelect">
@@ -201 +201 @@
 <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">

trunk/admin/themes/default/template/site_manager.tpl

@@ -40 +40 @@
   {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>]

trunk/admin/themes/default/template/site_update.tpl

@@ -9 +9 @@
 <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>
@@ -68 +68 @@
                         <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>
@@ -95 +95 @@
 
   <fieldset id="catSubset">
-    <legend>{'reduce to single existing categories'|@translate}</legend>
+    <legend>{'reduce to single existing albums'|@translate}</legend>
     <ul>
     <li>

trunk/admin/themes/default/template/upload.tpl

@@ -8 +8 @@
   <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>

trunk/admin/themes/default/template/user_perm.tpl

@@ -3 +3 @@
 {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>
@@ -15 +15 @@
 
 <fieldset>
-  <legend>{'Other private categories'|@translate}</legend>
+  <legend>{'Other private albums'|@translate}</legend>
 
   <form method="post" action="{$F_ACTION}">