Changeset 11587


Ignore:
Timestamp:
Jul 1, 2011, 3:19:35 PM (9 years ago)
Author:
mistic100
Message:

feature:2317 move order config to Admin->Config->Options
new GUI interface for simple paterns
in GUI, order_by and order_by_inside_category are merged (not un DB)
users can define special paterns with $conforder_by_custom and $conforder_by_inside_category_custom

Location:
trunk
Files:
1 added
18 edited

Legend:

Unmodified
Added
Removed
  • trunk/admin/configuration.php

    r11433 r11587  
    103103  );
    104104 
    105 $order_options = array(
    106     ' ORDER BY date_available DESC, file ASC, id ASC' => 'Post date DESC, File name ASC',
    107     ' ORDER BY date_available ASC, file ASC, id ASC' => 'Post date ASC, File name ASC',
    108     ' ORDER BY file DESC, date_available DESC, id ASC' => 'File name DESC, Post date DESC',
    109     ' ORDER BY file ASC, date_available DESC, id ASC' => 'File name ASC, Post date DESC',
    110     'custom' => l10n('Custom'),
     105// image order management
     106$sort_fields = array(
     107  '' => '',
     108  'rank' => l10n('Rank'),
     109  'file' => l10n('File name'),
     110  'date_creation' => l10n('Creation date'),
     111  'date_available' => l10n('Post date'),
     112  'average_rate' => l10n('Average rate'),
     113  'hit' => l10n('Most visited'),
     114  'id' => 'Id',
     115  );
     116
     117$sort_directions = array(
     118  'ASC' => l10n('ascending'),
     119  'DESC' => l10n('descending'),
    111120  );
    112121
     
    119128  {
    120129    case 'main' :
    121     {
    122       $order_regex = '#^(([ \w\']{2,}) (ASC|DESC),{1}){1,}$#';
    123       // process 'order_by_perso' string
    124       if ($_POST['order_by'] == 'custom' AND !empty($_POST['order_by_perso']))
    125       {
    126         $_POST['order_by_perso'] = stripslashes(trim($_POST['order_by_perso']));
    127         $_POST['order_by'] = str_ireplace(
    128           array('order by ', 'asc', 'desc', '"'),
    129           array(null, 'ASC', 'DESC', '\''),
    130           $_POST['order_by_perso']
    131           );
    132        
    133         if (preg_match($order_regex, $_POST['order_by'].','))
     130    {     
     131      if ( !isset($conf['order_by_custom']) and !isset($conf['order_by_inside_category_custom']) )
     132      {
     133        if ( !empty($_POST['order_by_field']) )
    134134        {
    135           $_POST['order_by'] = ' ORDER BY '.addslashes($_POST['order_by']);
     135          $order_by = array();
     136          $order_by_inside_category = array();
     137          for ($i=0; $i<count($_POST['order_by_field']); $i++)
     138          {
     139            if ($_POST['order_by_field'][$i] == '')
     140            {
     141              array_push($page['errors'], l10n('No field selected'));
     142            }
     143            else
     144            {
     145              if ($_POST['order_by_field'][$i] != 'rank')
     146              {
     147                $order_by[] = $_POST['order_by_field'][$i].' '.$_POST['order_by_direction'][$i];
     148              }
     149              $order_by_inside_category[] = $_POST['order_by_field'][$i].' '.$_POST['order_by_direction'][$i];
     150            }
     151          }
     152          $_POST['order_by'] = 'ORDER BY '.implode(', ', $order_by);
     153          $_POST['order_by_inside_category'] = 'ORDER BY '.implode(', ', $order_by_inside_category);
    136154        }
    137         else
    138         {
    139           array_push($page['errors'], l10n('Invalid order string').' &laquo; '.$_POST['order_by'].' &raquo;');
    140         }
    141       }
    142       else if ($_POST['order_by'] == 'custom')
    143       {
    144         array_push($page['errors'], l10n('Invalid order string'));
    145       }
    146       // process 'order_by_inside_category_perso' string
    147       if ($_POST['order_by_inside_category'] == 'as_order_by')
    148       {
    149         $_POST['order_by_inside_category'] = $_POST['order_by'];
    150       }
    151       else if ($_POST['order_by_inside_category'] == 'custom' AND !empty($_POST['order_by_inside_category_perso']))
    152       {
    153         $_POST['order_by_inside_category_perso'] = stripslashes(trim($_POST['order_by_inside_category_perso']));
    154         $_POST['order_by_inside_category'] = str_ireplace(
    155           array('order by ', 'asc', 'desc', '"'),
    156           array(null, 'ASC', 'DESC', '\''),
    157           $_POST['order_by_inside_category_perso']
    158           );
    159        
    160         if (preg_match($order_regex, $_POST['order_by_inside_category'].','))
    161         {
    162           $_POST['order_by_inside_category'] = ' ORDER BY '.addslashes($_POST['order_by_inside_category']);
    163         }
    164         else
    165         {
    166           array_push($page['errors'], l10n('Invalid order string').' &laquo; '.$_POST['order_by_inside_category'].' &raquo;');
    167         }
    168       }
    169       else if ($_POST['order_by_inside_category'] == 'custom')
    170       {
    171         array_push($page['errors'], l10n('Invalid order string'));
    172155      }
    173156     
     
    295278{
    296279  case 'main' :
    297   {
    298     // process 'order_by' string
    299     if (array_key_exists($conf['order_by'], $order_options))
    300     {
    301       $order_by_selected = $conf['order_by'];
    302       $order_by_perso = null;
     280  {   
     281   
     282    function order_by_is_local()
     283    {
     284      @include(PHPWG_ROOT_PATH. 'local/config/config.inc.php');
     285      if (isset($conf['local_dir_site']))
     286      {
     287        @include(PHPWG_ROOT_PATH.PWG_LOCAL_DIR. 'config/config.inc.php');
     288      }
     289     
     290      return isset($conf['order_by']) or isset($conf['order_by_inside_category']);
     291    }
     292   
     293    if (order_by_is_local())
     294    {
     295      array_push($page['warnings'], l10n('You have specified <i>$conf[\'order_by\']</i> in your local configuration file, this parameter in deprecated, please remove it or rename it into <i>$conf[\'order_by_custom\']</i> !'));
     296    }
     297   
     298    if ( isset($conf['order_by_custom']) or isset($conf['order_by_inside_category_custom']) )
     299    {
     300      $order_by = array(array(
     301        'FIELD' => '',   
     302        'DIRECTION' => 'ASC',
     303        ));
     304       
     305      $template->assign('ORDER_BY_IS_CUSTOM', true);
    303306    }
    304307    else
    305308    {
    306       $order_by_selected = 'custom';
    307       $order_by_perso = str_replace(' ORDER BY ', null, $conf['order_by']);
    308     }
    309     // process 'order_by_inside_category' string
    310     if ($conf['order_by_inside_category'] == $conf['order_by'])
    311     {
    312       $order_by_inside_category_selected = 'as_order_by';
    313       $order_by_inside_category_perso = null;
    314     }
    315     else if (array_key_exists($conf['order_by_inside_category'], $order_options))
    316     {
    317       $order_by_inside_category_selected = $conf['order_by_inside_category'];
    318       $order_by_inside_category_perso = null;
    319     }
    320     else
    321     {
    322       $order_by_inside_category_selected = 'custom';
    323       $order_by_inside_category_perso = str_replace(' ORDER BY ', null, $conf['order_by_inside_category']);
    324     }
    325      
     309      $out = array();
     310      $order_by = trim($conf['order_by_inside_category']);
     311      $order_by = str_replace('ORDER BY ', null, $order_by);
     312      $order_by = explode(', ', $order_by);
     313      foreach ($order_by as $field)
     314      {
     315        $field= explode(' ', $field);
     316        $out[] = array(
     317          'FIELD' => $field[0],   
     318          'DIRECTION' => $field[1],   
     319        );
     320      }
     321      $order_by = $out;
     322    }
     323 
    326324    $template->assign(
    327325      'main',
     
    335333          ),
    336334        'week_starts_on_options_selected' => $conf['week_starts_on'],
    337         'order_by_options' => $order_options,
    338         'order_by_selected' => $order_by_selected,
    339         'order_by_perso' => $order_by_perso,
    340         'order_by_inside_category_options' =>
    341           array_merge(
    342             array('as_order_by'=>l10n('As default order')),
    343             $order_options
    344             ),
    345         'order_by_inside_category_selected' => $order_by_inside_category_selected,
    346         'order_by_inside_category_perso' => $order_by_inside_category_perso,
    347         ));
     335        'order_by' => $order_by,
     336        'order_field_options' => $sort_fields,
     337        'order_direction_options' => $sort_directions,
     338        )
     339      );
    348340
    349341    foreach ($main_checkboxes as $checkbox)
  • trunk/admin/themes/default/template/configuration.tpl

    r11285 r11587  
    101101      <span class="property">
    102102        {'Default photos order'|@translate}
    103         {html_options name="order_by" options=$main.order_by_options selected=$main.order_by_selected}
    104         <input type="text" name="order_by_perso" size="40" value="{$main.order_by_perso}"
    105             {if $main.order_by_selected != 'custom'}style="display:none;"{/if}/>
    106       </span>
    107     </li>
    108     <li>
    109       &nbsp;
    110       <span class="property">
    111         {'Default photos order inside album'|@translate}
    112         {html_options name="order_by_inside_category" options=$main.order_by_inside_category_options selected=$main.order_by_inside_category_selected}
    113         <input type="text" name="order_by_inside_category_perso" size="40" value="{$main.order_by_inside_category_perso}"
    114             {if $main.order_by_inside_category_selected != 'custom'}style="display:none;"{/if}>
     103       
     104        {foreach from=$main.order_by item=order}
     105        <span class="filter {if $ORDER_BY_IS_CUSTOM}transparent{/if}">
     106          <a class="removeFilter" title="{'remove this filter'|@translate}"><span>[x]</span></a>
     107          <select name="order_by_field[]" {if $ORDER_BY_IS_CUSTOM}disabled{/if}>
     108            {html_options options=$main.order_field_options selected=$order.FIELD }
     109          </select>
     110          <select name="order_by_direction[]" {if $ORDER_BY_IS_CUSTOM}disabled{/if}>
     111            {html_options options=$main.order_direction_options selected=$order.DIRECTION }
     112          </select> 
     113        </span>
     114        {/foreach}
     115       
     116        {if !$ORDER_BY_IS_CUSTOM}
     117          <a class="addFilter" title="{'Add a filter'|@translate}"><span>[+]</span></a>
     118        {else}
     119          <span class="order_by_is_custom">{'You can\'t define a default photo order because you have a custom setting in your local configuration.'|@translate}</span>
     120        {/if}
    115121      </span>
    116122    </li>
    117123   
     124{if !$ORDER_BY_IS_CUSTOM}
    118125{footer_script require='jquery'}{literal}
    119126jQuery(document).ready(function () {
    120   $('select[name="order_by"]').change(function () {
    121     if ($(this).val() == 'custom') {
    122       $('input[name="order_by_perso"]').show();
    123     } else {
    124       $('input[name="order_by_perso"]').hide();
    125     }
     127  $('.addFilter').click(function() {
     128    rel = $(this).attr('rel');
     129    $(this).prev('span.filter').clone().insertBefore($(this));
     130    $(this).prev('span.filter').children('select[name="order_by_field[]"]').val('');
     131    $(this).prev('span.filter').children('select[name="order_by_direction[]"]').val('ASC');
     132     
     133    $(".removeFilter").click(function () {
     134      $(this).parent('span.filter').remove();
     135    });
    126136  });
    127   $('select[name="order_by_inside_category"]').change(function () {
    128     if ($(this).val() == 'custom') {
    129       $('input[name="order_by_inside_category_perso"]').show();
    130     } else {
    131       $('input[name="order_by_inside_category_perso"]').hide();
    132     }
     137 
     138  $(".removeFilter").click(function () {
     139    $(this).parent('span.filter').remove();
    133140  });
    134141});
    135142{/literal}{/footer_script}
     143{/if}
    136144  </ul>
    137145</fieldset>
  • trunk/admin/themes/default/theme.css

    r11014 r11587  
    10491049div.token-input-dropdown ul li em {font-weight: bold;font-style: normal;}
    10501050div.token-input-dropdown ul li.token-input-selected-dropdown-item {background-color: #3b5998;color: #fff;}
     1051
     1052#mainConfCheck a.addFilter {background: url(icon/plus.gif) no-repeat 0 4px;width:19px;height:19px;display:inline-block;}
     1053#mainConfCheck a.addFilter:hover {background-position:0 5px;border:none;}
     1054#mainConfCheck a.addFilter span {display:none;}
     1055#mainConfCheck a.removeFilter {background: url(icon/remove_filter.png) no-repeat top left;width:7px;height:7px;display:inline-block;}
     1056#mainConfCheck a.removeFilter:hover {background: url(icon/remove_filter_hover.png);border:none;}
     1057#mainConfCheck a.removeFilter span {display:none;}
     1058#mainConfCheck span.property span.filter:first-child a.removeFilter {display:none;} /* can't delete the first field */
     1059#mainConfCheck span.filter {margin-right:10px;}
     1060#mainConfCheck .transparent {opacity:0.5;filter:alpha(opacity=50);}
     1061#mainConfCheck .order_by_is_custom {display:block;font-weight:normal;font-style:italic;}
  • trunk/include/common.inc.php

    r11511 r11587  
    107107  @include(PHPWG_ROOT_PATH.PWG_LOCAL_DIR. 'config/config.inc.php');
    108108}
     109
     110// that's for migration from 2.2, will be deprecated in 2.4
     111if (isset($conf['order_by']))
     112{
     113  $conf['order_by_custom'] = $conf['order_by'];
     114}
     115if (isset($conf['order_by_inside_category']))
     116{
     117  $conf['order_by_inside_category_custom'] = $conf['order_by_inside_category'];
     118}
     119
    109120include(PHPWG_ROOT_PATH .'include/dblayer/functions_'.$conf['dblayer'].'.inc.php');
    110121
     
    143154
    144155load_plugins();
     156
     157// users can have defined a custom order pattern, incompatible with GUI form
     158if (isset($conf['order_by_custom']))
     159{
     160  $conf['order_by'] = $conf['order_by_custom'];
     161}
     162if (isset($conf['order_by_inside_category_custom']))
     163{
     164  $conf['order_by_inside_category'] = $conf['order_by_inside_category_custom'];
     165}
    145166
    146167include(PHPWG_ROOT_PATH.'include/user.inc.php');
  • trunk/include/config_default.inc.php

    r10685 r11587  
    4444// +-----------------------------------------------------------------------+
    4545
    46 // order_by : how to change the order of display for images in a category ?
    47 //
    48 // There are several fields that can order the display :
    49 //
    50 //  - date_available : the date of the adding to the gallery
    51 //  - file : the name of the file
    52 //  - id : element identifier
    53 //  - date_creation : date of element creation
    54 //
    55 // Once you've chosen which field(s) to use for ordering, you must chose the
    56 // ascending or descending order for each field.  examples :
    57 //
    58 // 1. $conf['order_by'] = " order by date_available desc, file asc";
    59 //    will order pictures by date_available descending & by filename ascending
    60 //
    61 // 2. $conf['order_by'] = " order by file asc";
    62 //    will only order pictures by file ascending without taking into account
    63 //    the date_available
    64 $conf['order_by'] = ' ORDER BY date_available DESC, file ASC, id ASC';
     46// order_by_custom and order_by_inside_category_custom : for non common pattern
     47// you can define special ORDER configuration
     48//
     49// $conf['order_by_custom'] = ' ORDER BY date_available DESC, file ASC, id ASC';
    6550
    6651// order_by_inside_category : inside a category, images can also be ordered
    6752// by rank. A manually defined rank on each image for the category.
    6853//
    69 // In addition to fields of #images table, you can use the
    70 // #image_category.rank column
    71 //
    72 // $conf['order_by_inside_category'] = ' ORDER BY rank';
    73 // will sort images by the manually defined rank of images in this album.
    74 $conf['order_by_inside_category'] = $conf['order_by'];
     54// $conf['order_by_inside_category_custom'] = $conf['order_by_custom'];
    7555
    7656// file_ext : file extensions (case sensitive) authorized
  • trunk/install/config.sql

    r11285 r11587  
    5353INSERT INTO piwigo_config (param,value,comment) VALUES ('week_starts_on','monday','Monday may not be the first day of the week');
    5454INSERT INTO piwigo_config (param,value,comment) VALUES ('updates_ignored','a:3:{s:7:"plugins";a:0:{}s:6:"themes";a:0:{}s:9:"languages";a:0:{}}','Extensions ignored for update');
    55 INSERT INTO piwigo_config (param,value,comment) VALUES ('order_by',' ORDER BY date_available DESC, file ASC, id ASC','default photo order');
    56 INSERT INTO piwigo_config (param,value,comment) VALUES ('order_by_inside_category',' ORDER BY date_available DESC, file ASC, id ASC','default photo order inside category');
     55INSERT INTO piwigo_config (param,value,comment) VALUES ('order_by','ORDER BY date_available DESC, file ASC, id ASC','default photo order');
     56INSERT INTO piwigo_config (param,value,comment) VALUES ('order_by_inside_category','ORDER BY date_available DESC, file ASC, id ASC','default photo order inside category');
    5757INSERT INTO piwigo_config (param,value) VALUES ('upload_form_websize_resize','true');
    5858INSERT INTO piwigo_config (param,value) VALUES ('upload_form_websize_maxwidth','800');
  • trunk/language/cs_CZ/admin.lang.php

    r11387 r11587  
    794794$lang['Type in a search term'] = 'Zadejte hledaný výraz';
    795795$lang['Activate icon "new" next to albums and pictures'] = 'Aktivovat ikonu "nové" vedle alb a obrázků';
    796 $lang['As default order'] = 'Jako výchozí pořadí';
    797796$lang['Compact'] = 'Kompaktní';
    798797$lang['Complete'] = 'Kompletní';
    799 $lang['Custom'] = 'Běžný';
    800798$lang['Deactivate all'] = 'Deaktivovat vše';
    801799$lang['Default photos order'] = 'Výchozí pořadí fotografií';
    802 $lang['Default photos order inside album'] = 'Výchozí pořadí fotografií uvnitř album';
    803 $lang['Invalid order string'] = 'Neplatný řetězec výběru';
    804800$lang['Restore'] = 'Obnovit';
    805801$lang['Restore default configuration. You will lost your plugin settings!'] = 'Obnovit výchozí konfiguraci. Přijdete o nastavení v pluginech!';
  • trunk/language/en_UK/admin.lang.php

    r11288 r11587  
    152152$lang['Are you sure you want to delete this plugin?'] = "Are you sure you want to delete this plugin?";
    153153$lang['Are you sure you want to install this plugin?'] = "Are you sure you want to install this plugin?";
    154 $lang['As default order'] = "As default order";
    155154$lang['Associate to album'] = "Associate to album";
    156155$lang['associate to group'] = "associate to group";
     
    205204$lang['created'] = "created";
    206205$lang['Current name'] = "Current name";
    207 $lang['Custom'] = "Custom";
    208206$lang['Database synchronization with files'] = "Database synchronization with files";
    209207$lang['Database'] = "Database";
     
    214212$lang['Default display'] = "Default display";
    215213$lang['Default photos order'] = "Default photos order";
    216 $lang['Default photos order inside album'] = "Default photos order inside album";
    217214$lang['Default user cannot be deleted'] = "Default user cannot be deleted";
    218215$lang['Default user does not exist'] = "The default user does not exist";
     
    364361$lang['Installed Themes'] = "Installed Themes";
    365362$lang['Instructions to use Piwigo'] = "Instructions to use Piwigo";
    366 $lang['Invalid order string'] = 'Invalid order string';
    367363$lang['Invert'] = 'Invert';
    368364$lang['IP'] = "IP";
     
    775771$lang['You cannot delete your account'] = "You cannot delete your account";
    776772$lang['You cannot move an album in its own sub album'] = "You cannot move an album in its own sub album";
     773$lang['You can\'t define a default photo order because you have a custom setting in your local configuration.'] = 'You can\'t define a default photo order because you have a custom setting in your local configuration.';
    777774$lang['You have %d orphan tags: %s.'] = 'You have %d orphan tags: %s.';
     775$lang['You have specified <i>$conf[\'order_by\']</i> in your local configuration file, this parameter in deprecated, please remove it or rename it into <i>$conf[\'order_by_custom\']</i> !'] = 'You have specified <i>$conf[\'order_by\']</i> in your local configuration file, this parameter in deprecated, please remove it or rename it into <i>$conf[\'order_by_custom\']</i> !';
    778776$lang['You have subscribed to receiving notifications by mail.'] = "You have subscribed to receive notifications by mail.";
    779777$lang['You have unsubscribed from receiving notifications by mail.'] = "You have unsubscribed from being notified by mail.";
  • trunk/language/fr_FR/admin.lang.php

    r11285 r11587  
    849849$lang['new'] = 'nouveau';
    850850$lang['Default photos order'] = "Ordre par défaut des photos";
    851 $lang['Default photos order inside album'] = "Ordre par défaut des photos dans un album";
    852 $lang['Invalid order string'] = 'Chaîne SQL incorrecte';
    853 $lang['As default order'] = "Comme l'ordre par défaut";
    854 $lang['Custom'] = "Personnalisé";
    855851$lang['Activate icon "new" next to albums and pictures'] = 'Afficher l\'icône "nouveau" à côté des albums et des photos';
     852$lang['You can\'t define a default photo order because you have a custom setting in your local configuration.'] = 'Vous ne pouvez définir l\'ordre par défaut des photos car vous avez un paramètre personnalisé dans votre configuration locale.';
     853$lang['You have specified <i>$conf[\'order_by\']</i> in your local configuration file, this parameter in deprecated, please remove it or rename it into <i>$conf[\'order_by_custom\']</i> !'] = 'Vous avez spécifié <i>$conf[\'order_by\']</i> dans votre fichier de configuration, ce paramètre est obsolète, veuillez le supprimer ou le renommer en <i>$conf[\'order_by_custom\']</i> !';
     854
    856855?>
  • trunk/language/he_IL/admin.lang.php

    r11397 r11587  
    804804$lang['Graphics Library'] = 'ספריית גרפיקה';
    805805$lang['Activate icon "new" next to albums and pictures'] = 'הפעל כפתו "חדש" ליד אלבומים';
    806 $lang['As default order'] = 'כסדר ברירת מחדל';
    807806$lang['Compact'] = 'קומפקטי';
    808807$lang['Complete'] = 'סיים';
    809 $lang['Custom'] = 'מותאם אישית';
    810808$lang['Deactivate all'] = 'בטל פעולה להכל';
    811809$lang['Default photos order'] = 'סדר ברירת מחדל לתמונות';
    812 $lang['Default photos order inside album'] = 'סדר ברירת מחדל לתמונות באלבום';
    813 $lang['Invalid order string'] = 'מחרוזת סדר לא חוקית';
    814810$lang['Restore'] = 'שחזר';
    815811$lang['Restore default configuration. You will lost your plugin settings!'] = 'שחזר להגדרות ברירת מחדל. הגדרות ההתקן יאבדו!';
  • trunk/language/it_IT/admin.lang.php

    r11518 r11587  
    849849$lang['new'] = 'nuovo';
    850850$lang['Default photos order'] = 'Ordinamento di default delle foto';
    851 $lang['Default photos order inside album'] = 'Ordinamento di default delle foto in un album';
    852 $lang['Invalid order string'] = 'Stringa SQL non corretta';
    853 $lang['As default order'] = 'Come ordinamento di default';
    854 $lang['Custom'] = 'Personalizzare';
    855851$lang['Activate icon "new" next to albums and pictures'] = 'Visualizzare l\'icona "nuovo" a fianco degli album e delle foto';
    856852?>
  • trunk/language/ja_JP/admin.lang.php

    r11336 r11587  
    727727$lang['Complete'] = '完了';
    728728$lang['Activate icon "new" next to albums and pictures'] = 'アルバムと写真のとなりに、\'起動アイコン "新" があります';
    729 $lang['As default order'] = 'デフォルト順として';
    730 $lang['Custom'] = 'カスタム';
    731729$lang['Deactivate all'] = '全て非活性する';
    732730$lang['Default photos order'] = 'デフォルト写真順番';
    733 $lang['Default photos order inside album'] = 'デフォルト写真順はアルバム中';
    734731$lang['Delete orphan tags'] = '捨てられたタグを削除する';
    735732$lang['delete photo'] = '写真を削除する';
  • trunk/language/lv_LV/admin.lang.php

    r11448 r11587  
    791791$lang['Searching...'] = 'Meklē...';
    792792$lang['Type in a search term'] = 'Ierakstiet meklējamo vārdu';
    793 $lang['As default order'] = 'Kā pēc noklusējuma';
    794793$lang['Compact'] = 'Kompaktēt';
    795794$lang['Complete'] = 'Pabeigt';
    796 $lang['Custom'] = 'Pielāgots';
    797795$lang['Deactivate all'] = 'Deaktivēt visu';
    798796$lang['Default photos order'] = 'Foto kārtojums pēc noklusējuma';
    799 $lang['Default photos order inside album'] = 'Foto kārtojums pēc noklusējuma albumā';
    800 $lang['Invalid order string'] = 'Kļūdaina kārtojuma rinda';
    801797$lang['Restore'] = 'Atjaunot';
    802798$lang['Restore default configuration. You will lost your plugin settings!'] = 'Atjaunot noklusējuma konfigurāciju. Jūs zaudēsit savus spraudņa iestatījumus!';
  • trunk/language/pl_PL/admin.lang.php

    r11536 r11587  
    791791$lang['Type in a search term'] = 'Wpisz frazę do wyszukania';
    792792$lang['Activate icon "new" next to albums and pictures'] = 'Aktywuj ikonę "nowe" obok albumów i zdjęć';
    793 $lang['As default order'] = 'Jako sortowanie domyślne';
    794793$lang['Compact'] = 'Minimalne';
    795794$lang['Complete'] = 'Pełne';
    796 $lang['Custom'] = 'Własne';
    797795$lang['Deactivate all'] = 'Deaktywuj wszystko';
    798796$lang['Default photos order'] = 'Domślne sortowanie zdjęć';
    799 $lang['Default photos order inside album'] = 'Domyślne sortowanie zdjęć w albumie';
    800 $lang['Invalid order string'] = 'Niepoprawny ciąg sortowania';
    801797$lang['Restore'] = 'Przywróć';
    802798$lang['Restore default configuration. You will lost your plugin settings!'] = 'Przywróć domyślną konfigurację. Stracisz ustawienia wtyczek!';
  • trunk/language/ru_RU/admin.lang.php

    r11571 r11587  
    790790$lang['display'] = 'показать';
    791791$lang['Activate icon "new" next to albums and pictures'] = 'Активировать иконку "new" рядом с альбомами и фотографиями';
    792 $lang['As default order'] = 'Порядок по умолчанию';
    793792$lang['Compact'] = 'Компактный';
    794793$lang['Complete'] = 'Полный';
    795 $lang['Custom'] = 'Пользовательский';
    796794$lang['Deactivate all'] = 'Деактивировать все';
    797795$lang['Default photos order'] = 'Порядок фотографий по умолчанию';
    798 $lang['Default photos order inside album'] = 'Порядок фотографий в альбоме по умолчанию';
    799 $lang['Invalid order string'] = 'Недопустимое значение сортировки';
    800796$lang['Restore'] = 'Восстановить';
    801797$lang['Restore default configuration. You will lost your plugin settings!'] = 'Восстановление конфигурации по умолчанию. Ваши настройки плагинов будут потеряны!';
  • trunk/language/sk_SK/admin.lang.php

    r11548 r11587  
    841841$lang['Graphics Library'] = 'Grafická knižnica';
    842842$lang['Activate icon "new" next to albums and pictures'] = 'Aktivovať ikonu "new" pre ďalšie albumy a fotky';
    843 $lang['As default order'] = 'Ako predvolené zoradenie';
    844 $lang['Custom'] = 'Voliteľné';
    845843$lang['Default photos order'] = 'Predvolené zoradenie fotiek';
    846 $lang['Default photos order inside album'] = 'Predvolené zoradenie fotografií vo vnútri albumu';
    847 $lang['Invalid order string'] = 'Neplatný zoraďovací sled';
    848 
    849844
    850845?>
  • trunk/language/sv_SE/admin.lang.php

    r11452 r11587  
    798798$lang['Type in a search term'] = 'Ange nytt sökord';
    799799$lang['Activate icon "new" next to albums and pictures'] = 'Aktivera ikonen "ny" intill album och bilder';
    800 $lang['As default order'] = 'Standardordning';
    801800$lang['Compact'] = 'Kompakt';
    802801$lang['Complete'] = 'Komplett';
    803 $lang['Custom'] = 'Anpassad';
    804802$lang['Deactivate all'] = 'Avaktivera allt';
    805803$lang['Default photos order'] = 'Standardordning för bilder';
    806 $lang['Default photos order inside album'] = 'Standardordning för bilder i ett album';
    807 $lang['Invalid order string'] = 'Fel ordningssträng';
    808804$lang['Restore'] = 'Återställ';
    809805$lang['Restore default configuration. You will lost your plugin settings!'] = 'Återställ standardkonfiguration. Du kommer att förlora inställingarna för din plugins!';
  • trunk/language/tr_TR/admin.lang.php

    r11412 r11587  
    831831$lang['Graphics Library'] = 'Grafik Arşivi';
    832832$lang['Activate icon "new" next to albums and pictures'] = 'Resimlerin yanındaki "yeni" simgesini etkinleştir';
    833 $lang['As default order'] = 'Varsayılan düzen olarak';
    834 $lang['Custom'] = 'özel';
    835833$lang['Default photos order'] = 'Varsayılan resim düzeni';
    836 $lang['Default photos order inside album'] = 'Albüm içindeki varsayılan resim düzeni';
    837 $lang['Invalid order string'] = 'Geçersiz düzen';
     834
    838835?>
Note: See TracChangeset for help on using the changeset viewer.