Changeset 2907 for branches/2.0/plugins


Ignore:
Timestamp:
Nov 24, 2008, 11:37:13 PM (15 years ago)
Author:
patdenice
Message:

merge -c2906 from trunk to branch 2.0.

  • Replace all #content by .content in Sylvia theme.css.
  • In LocalFiles Editor, show error message when creating new template file with empty filename.
Location:
branches/2.0/plugins/LocalFilesEditor
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • branches/2.0/plugins/LocalFilesEditor/admin.php

    r2713 r2907  
    9494{
    9595  $filename = $_POST['tpl_name'];
     96  if (empty($filename))
     97  {
     98    array_push($page['errors'], l10n('locfiledit_empty_filename'));
     99  }
    96100  if (get_extension($filename) != 'tpl')
    97101  {
    … …  
    101105  {
    102106    array_push($page['errors'], l10n('locfiledit_filename_error'));
     107  }
     108  if (is_numeric($_POST['tpl_model']) and $_POST['tpl_model'] != '0')
     109  {
     110    array_push($page['errors'], l10n('locfiledit_model_error'));
     111  }
     112  if (file_exists($_POST['tpl_parent'] . '/' . $filename))
     113  {
     114    array_push($page['errors'], l10n('locfiledit_file_already_exists'));
     115  }
     116  if (!empty($page['errors']))
     117  {
    103118    $newfile_page = true;
    104119  }
    105   if (is_numeric($_POST['tpl_model']) and $_POST['tpl_model'] != '0')
    106   {
    107     array_push($page['errors'], l10n('locfiledit_model_error'));
    108     $newfile_page = true;
    109   }
    110   if (file_exists($_POST['tpl_parent'] . '/' . $filename))
    111   {
    112     array_push($page['errors'], l10n('locfiledit_file_already_exists'));
    113     $newfile_page = true;
    114   }
    115   if (!$newfile_page)
     120  else
    116121  {
    117122    $edited_file = $_POST['tpl_parent'] . '/' . $filename;

  • branches/2.0/plugins/LocalFilesEditor/language/de_DE/plugin.lang.php

    r2782 r2907  
    5252$lang['locfiledit_file_already_exists'] = 'Datei ist bereits vorhanden.';
    5353$lang['locfiledit_model_error'] = 'Sie müssen ein Modell wählen.';
     54/* TODO */ $lang['locfiledit_empty_filename'] = 'You must fill file name.';
    5455
    5556?>

  • branches/2.0/plugins/LocalFilesEditor/language/en_UK/plugin.lang.php

    r2588 r2907  
    5252$lang['locfiledit_file_already_exists'] = 'File already exists.';
    5353$lang['locfiledit_model_error'] = 'You must choose a model.';
     54$lang['locfiledit_empty_filename'] = 'You must fill file name.';
    5455
    5556?>

  • branches/2.0/plugins/LocalFilesEditor/language/es_ES/plugin.lang.php

    r2686 r2907  
    5252$lang['locfiledit_file_already_exists'] = 'El fichero ya existe.';
    5353$lang['locfiledit_model_error'] = 'Por favor, seleccione un modelo.';
     54/* TODO */ $lang['locfiledit_empty_filename'] = 'You must fill file name.';
    5455
    5556?>

  • branches/2.0/plugins/LocalFilesEditor/language/fr_FR/plugin.lang.php

    r2588 r2907  
    5252$lang['locfiledit_file_already_exists'] = 'Le fichier existe déjà.';
    5353$lang['locfiledit_model_error'] = 'Veuillez sélectionner un modèle.';
     54$lang['locfiledit_empty_filename'] = 'Veuillez indiquer un nom de fichier.';
    5455
    5556?>

  • branches/2.0/plugins/LocalFilesEditor/language/it_IT/plugin.lang.php

    r2886 r2907  
    5252$lang['locfiledit_file_already_exists'] = 'Il file esiste già.';
    5353$lang['locfiledit_model_error'] = 'Selezionare un modello.';
     54/* TODO */ $lang['locfiledit_empty_filename'] = 'You must fill file name.';
    5455
    5556?>
Note: See TracChangeset for help on using the changeset viewer.