diff options
| -rw-r--r-- | admin/maintenance.php | 11 | ||||
| -rw-r--r-- | language/en_UK/admin.lang.php | 9 | ||||
| -rw-r--r-- | language/en_UK/common.lang.php | 4 | ||||
| -rw-r--r-- | language/es_ES/admin.lang.php | 9 | ||||
| -rw-r--r-- | language/es_ES/common.lang.php | 3 | ||||
| -rw-r--r-- | language/fr_FR/admin.lang.php | 9 | ||||
| -rw-r--r-- | language/fr_FR/common.lang.php | 3 | ||||
| -rw-r--r-- | language/nl_NL/admin.lang.php | 8 | ||||
| -rw-r--r-- | language/nl_NL/common.lang.php | 3 | ||||
| -rw-r--r-- | template/yoga/admin/maintenance.tpl | 24 | ||||
| -rw-r--r-- | template/yoga/search.tpl | 9 |
11 files changed, 30 insertions, 62 deletions
diff --git a/admin/maintenance.php b/admin/maintenance.php index 18d4bad92..eb71adda9 100644 --- a/admin/maintenance.php +++ b/admin/maintenance.php @@ -104,6 +104,12 @@ DELETE $c13y->maintenance(); break; } + case 'compiled-templates' : + { + $template->smarty->clear_compiled_tpl(); + file_put_contents($template->smarty->compile_dir.'/index.htm', ''); + break; + } default : { break; @@ -116,9 +122,9 @@ DELETE $template->set_filenames(array('maintenance'=>'admin/maintenance.tpl')); -$start_url = PHPWG_ROOT_PATH.'admin.php?page=maintenance&action='; +$start_url = get_root_url().'admin.php?page=maintenance&action='; -$template->assign_vars( +$template->assign( array( 'U_MAINT_CATEGORIES' => $start_url.'categories', 'U_MAINT_IMAGES' => $start_url.'images', @@ -128,6 +134,7 @@ $template->assign_vars( 'U_MAINT_FEEDS' => $start_url.'feeds', 'U_MAINT_DATABASE' => $start_url.'database', 'U_MAINT_C13Y' => $start_url.'c13y', + 'U_MAINT_COMPILED_TEMPLATES' => $start_url.'compiled-templates', 'U_HELP' => PHPWG_ROOT_PATH.'popuphelp.php?page=maintenance', ) ); diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php index c9f341a9b..b17fcfe7e 100644 --- a/language/en_UK/admin.lang.php +++ b/language/en_UK/admin.lang.php @@ -434,15 +434,12 @@ $lang['title_update'] = 'Database synchronization with files'; $lang['title_upload'] = 'Pictures waiting for validation'; $lang['tn_all'] = 'all'; $lang['tn_alone_title'] = 'pictures without thumbnail (jpeg and png only)'; -$lang['tn_dirs_alone'] = 'pictures without thumbnail'; -$lang['tn_dirs_title'] = 'Directories list'; $lang['tn_err_height'] = 'height must be a number superior to'; $lang['tn_err_width'] = 'width must be a number superior to'; $lang['tn_format'] = 'for the file format'; $lang['tn_no_missing'] = 'No missing thumbnail'; $lang['tn_no_support'] = 'Picture unreachable or no support'; $lang['tn_params_GD'] = 'GD version'; -$lang['tn_params_create'] = 'create'; $lang['tn_params_title'] = 'Miniaturization parameters'; $lang['tn_results_gen_time'] = 'generated in'; $lang['tn_results_title'] = 'Results of miniaturization'; @@ -536,7 +533,6 @@ $lang['ws_Request'] = ' Request '; $lang['ws_Limit'] = ' Limit '; $lang['ws_Comment'] = ' Comment '; $lang['Modify End from Now +'] = 'Modify End from Now + '; -$lang['Free comment, use it to identify your partner clearly'] = ' Free comment, use it to identify your partner clearly '; $lang['Confirmation'] = ' Confirmation '; $lang['Delete'] = ' Remove '; $lang['Confidential partner key'] = 'Confidential partner key'; @@ -567,7 +563,6 @@ $lang['Year'] = 'Year'; $lang['Month'] = 'Month'; $lang['Day'] = 'Day'; $lang['Pages seen'] = 'Pages seen'; -//$lang['only'] = 'only'; $lang['Pictures'] = 'Pictures'; $lang['High quality'] = 'High quality'; $lang['time'] = 'time'; @@ -634,6 +629,7 @@ $lang['c13y_webmaster_non_existent'] = 'Main "webmaster" user don\'t exist any m $lang['c13y_bad_webmaster_status'] = 'Main "webmaster" user status is incorrect'; $lang['c13y_user_created'] = 'User "%s" created with "%s" like password'; $lang['c13y_user_status_updated'] = 'Status of user "%s" updated'; +$lang['add new elements to caddie'] = 'add new elements to caddie'; // --------- Starting below: New or revised $lang ---- from Butterfly (1.8) $lang['no_display_thumbnail'] = 'No display'; $lang['display_thumbnail_classic'] = 'Classic display'; @@ -685,4 +681,5 @@ $lang['plugins_extract_error'] = 'An error occured during extraction (%s).'; $lang['plugins_check_chmod'] = 'Please check "plugins" folder and sub-folders permissions (CHMOD).'; $lang['plugins_server_error'] = 'Can\'t connect to server.'; -?> +$lang['Purge compiled templates'] = 'Purge compiled templates'; +?>
\ No newline at end of file diff --git a/language/en_UK/common.lang.php b/language/en_UK/common.lang.php index 23a7c8e1c..cae146631 100644 --- a/language/en_UK/common.lang.php +++ b/language/en_UK/common.lang.php @@ -294,21 +294,18 @@ $lang['representative'] = 'representative'; $lang['reset'] = 'Reset'; $lang['return to homepage'] = 'return to homepage'; $lang['search'] = 'Search'; -$lang['search_ascending'] = 'Ascending'; $lang['search_author'] = 'Search for Author'; $lang['search_categories'] = 'Search in Categories'; $lang['search_date'] = 'Search by Date'; $lang['search_date_from'] = 'Date'; $lang['search_date_to'] = 'End-Date'; $lang['search_date_type'] = 'Kind of date'; -$lang['search_descending'] = 'Descending'; $lang['search_keywords'] = 'Search for words'; $lang['search_mode_and'] = 'Search for all terms '; $lang['search_mode_or'] = 'Search for any terms'; $lang['search_one_clause_at_least'] = 'Empty query. No criteria has been entered.'; $lang['search_options'] = 'Search Options'; $lang['search_result'] = 'Search results'; -$lang['search_sort'] = 'Sort results by'; $lang['search_subcats_included'] = 'Search in subcategories'; $lang['search_title'] = 'Search'; $lang['searched words : %s'] = 'searched words : %s'; @@ -375,7 +372,6 @@ $lang['Waiting page: %s'] = 'Waiting page: %s'; $lang['Picture uploaded by %s'] = 'Picture uploaded by %s'; // --------- Starting below: New or revised $lang ---- from version 1.7.1 $lang['guest_must_be_guest'] = 'Bad status for user "guest", using default status. Please notify the webmaster.'; -$lang['add new elements to caddie'] = 'add new elements to caddie'; // --------- Starting below: New or revised $lang ---- from Butterfly (1.8) $lang['Administrator, webmaster and special user cannot use this method'] = 'Administrator, webmaster and special user cannot use this method'; $lang['reg_err_mail_address_dbl'] = 'a user use already this mail address'; diff --git a/language/es_ES/admin.lang.php b/language/es_ES/admin.lang.php index cd006c7ee..de805d6e4 100644 --- a/language/es_ES/admin.lang.php +++ b/language/es_ES/admin.lang.php @@ -434,15 +434,12 @@ $lang['title_update'] = 'Sincronización de la base de datos a partir de los fic $lang['title_upload'] = 'Imágenes en espera de validación'; $lang['tn_all'] = 'todo'; $lang['tn_alone_title'] = 'imagen sin miniatura (jpeg y png únicamente)'; -$lang['tn_dirs_alone'] = 'imagenes sin miniatura'; -$lang['tn_dirs_title'] = 'Lista repertorios'; $lang['tn_err_height'] = 'La altura debe un entero superior a'; $lang['tn_err_width'] = 'La anchura debe ser un entero superior a'; $lang['tn_format'] = 'para el tamaño de fichero'; $lang['tn_no_missing'] = 'Ninguna miniatura falta'; $lang['tn_no_support'] = 'Imagen inaccesible o no sostenida'; $lang['tn_params_GD'] = 'versión de GD'; -$lang['tn_params_create'] = 'crear'; $lang['tn_params_title'] = 'Parámetro de miniaturización'; $lang['tn_results_gen_time'] = 'generada de allí'; $lang['tn_results_title'] = 'Los resultados de la miniaturización'; @@ -570,7 +567,6 @@ $lang['Year'] = 'Año'; $lang['Month'] = 'Mes'; $lang['Day'] = 'Día'; $lang['Pages seen'] = 'Páginas vistas'; -$lang['only'] = 'únicamente'; $lang['Pictures'] = 'Imágenes'; $lang['High quality'] = 'Alta resolución'; $lang['time'] = 'Hora'; @@ -601,8 +597,6 @@ $lang['Image id'] = 'Identificando imagen'; $lang['Summary'] = 'Resumen'; $lang['%d line filtered'] = '%d línea filtrada'; $lang['%d lines filtered'] = '%d Líneas filtradas'; -$lang['%d member: %s'] = '%d iembro: %s'; -$lang['%d members: %s'] = '%d miembros: %s'; $lang['%d guest'] = '%d invitado'; $lang['%d guests'] = '%d Invitados'; $lang['Hour'] = 'Hora'; @@ -665,4 +659,5 @@ $lang['c13y_ignore_msg2'] = 'La corrección de la anomalía anulará el hecho de $lang['c13y_anomaly_ignored_count'] = '%d anomalía ha sido ignorada.'; $lang['c13y_anomalies_ignored_count'] = '%d anomalías han sido ignoradas.'; -?> +/* TODO */ $lang['Purge compiled templates'] = 'Purge compiled templates'; +?>
\ No newline at end of file diff --git a/language/es_ES/common.lang.php b/language/es_ES/common.lang.php index e8e312ca7..779eb743f 100644 --- a/language/es_ES/common.lang.php +++ b/language/es_ES/common.lang.php @@ -294,21 +294,18 @@ $lang['representative'] = 'representante'; $lang['reset'] = 'Borrar'; $lang['return to homepage'] = 'Volver a la página de inicio'; $lang['search'] = 'Búsqueda'; -$lang['search_ascending'] = 'Ascendiente'; $lang['search_author'] = 'Buscar por autor'; $lang['search_categories'] = 'Buscar bajo categorías'; $lang['search_date'] = 'Buscar por fecha'; $lang['search_date_from'] = 'Fecha'; $lang['search_date_to'] = 'Hasta la fecha'; $lang['search_date_type'] = 'Tipo de fecha'; -$lang['search_descending'] = 'Descendiente'; $lang['search_keywords'] = 'Buscar por palabra'; $lang['search_mode_and'] = 'Buscar todas las palabras'; $lang['search_mode_or'] = 'Buscar una de las palabras'; $lang['search_one_clause_at_least'] = 'Demanda vacía. Ningún criterio surtido..'; $lang['search_options'] = 'Opciones de búsqueda'; $lang['search_result'] = 'Resultados de la búsqueda'; -$lang['search_sort'] = 'Clasificar los resultados de la búsqueda por'; $lang['search_subcats_included'] = 'Buscar en las subcategorías'; $lang['search_title'] = 'Búsqueda'; $lang['searched words : %s'] = 'buscar palabras : %s'; diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php index 601052754..70b90af4d 100644 --- a/language/fr_FR/admin.lang.php +++ b/language/fr_FR/admin.lang.php @@ -434,15 +434,12 @@ $lang['title_update'] = 'Synchronisation de la base de données à partir des fi $lang['title_upload'] = 'Images en attente de validation'; $lang['tn_all'] = 'tout'; $lang['tn_alone_title'] = 'image sans miniature (jpeg et png uniquement)'; -$lang['tn_dirs_alone'] = 'images sans miniature'; -$lang['tn_dirs_title'] = 'Liste des répertoires'; $lang['tn_err_height'] = 'la hauteur doit un entier supérieur à'; $lang['tn_err_width'] = 'la largeur doit être un entier supérieur à'; $lang['tn_format'] = 'pour le format de fichier'; $lang['tn_no_missing'] = 'Aucune miniature ne manque'; $lang['tn_no_support'] = 'Image inaccessible ou non supportée'; $lang['tn_params_GD'] = 'version de GD'; -$lang['tn_params_create'] = 'créer'; $lang['tn_params_title'] = 'Paramètre de miniaturisation'; $lang['tn_results_gen_time'] = 'générée en'; $lang['tn_results_title'] = 'Résultats de la miniaturisation'; @@ -566,7 +563,6 @@ $lang['Year'] = 'Année'; $lang['Month'] = 'Mois'; $lang['Day'] = 'Jour'; $lang['Pages seen'] = 'Pages vues'; -$lang['only'] = 'uniquement'; $lang['Pictures'] = 'Images'; $lang['High quality'] = 'Haute résolution'; $lang['time'] = 'heure'; @@ -597,8 +593,6 @@ $lang['Image id'] = 'Identifiant image'; $lang['Summary'] = 'Résumé'; $lang['%d line filtered'] = '%d ligne filtrée'; $lang['%d lines filtered'] = '%d lignes filtrées'; -$lang['%d member: %s'] = '%d membre: %s'; -$lang['%d members: %s'] = '%d membres: %s'; $lang['%d guest'] = '%d invité'; $lang['%d guests'] = '%d invités'; $lang['Hour'] = 'Heure'; @@ -687,4 +681,5 @@ $lang['plugins_extract_error'] = 'Une erreur est survenue pendant l\'extraction $lang['plugins_check_chmod'] = 'Vérifiez les permissions du dossier "plugins" et de ses sous-dossiers (CHMOD).'; $lang['plugins_server_error'] = 'Impossible de se connecter au serveur.'; -?> +$lang['Purge compiled templates'] = 'Purger les templates compilés'; +?>
\ No newline at end of file diff --git a/language/fr_FR/common.lang.php b/language/fr_FR/common.lang.php index 8efc46286..2eaf64435 100644 --- a/language/fr_FR/common.lang.php +++ b/language/fr_FR/common.lang.php @@ -294,21 +294,18 @@ $lang['representative'] = 'représentant'; $lang['reset'] = 'Annuler'; $lang['return to homepage'] = 'retour à la page d\'accueil'; $lang['search'] = 'Recherche'; -$lang['search_ascending'] = 'Croissant'; $lang['search_author'] = 'Rechercher un auteur'; $lang['search_categories'] = 'Rechercher dans les catégories'; $lang['search_date'] = 'Recherche par date'; $lang['search_date_from'] = 'Date'; $lang['search_date_to'] = 'Date de fin'; $lang['search_date_type'] = 'Type de date'; -$lang['search_descending'] = 'Décroissant'; $lang['search_keywords'] = 'Recherche de mot'; $lang['search_mode_and'] = 'Rechercher tous les mots'; $lang['search_mode_or'] = 'Rechercher un des mots'; $lang['search_one_clause_at_least'] = 'Requête vide. Aucun critère fourni.'; $lang['search_options'] = 'Options de recherche'; $lang['search_result'] = 'Résultats de recherche'; -$lang['search_sort'] = 'Trier les résultats de recherche selon'; $lang['search_subcats_included'] = 'Rechercher dans les sous-catégories'; $lang['search_title'] = 'Recherche'; $lang['searched words : %s'] = 'mots recherchés : %s'; diff --git a/language/nl_NL/admin.lang.php b/language/nl_NL/admin.lang.php index fb1f47b87..4df7419ae 100644 --- a/language/nl_NL/admin.lang.php +++ b/language/nl_NL/admin.lang.php @@ -435,15 +435,12 @@ $lang['title_update'] = 'Database synchronizatie met bestanden'; $lang['title_upload'] = 'afbeeldingen wachten op bevestiging'; $lang['tn_all'] = 'alles'; $lang['tn_alone_title'] = 'afbeeldingen zonder thumbnail (alleen jpeg en png)'; -$lang['tn_dirs_alone'] = 'afbeeldingen zonder thumbnail'; -$lang['tn_dirs_title'] = 'Mappenlijst'; $lang['tn_err_height'] = 'Hoogte moet groter zijn dan'; $lang['tn_err_width'] = 'Breedte moet groter zijn dan'; $lang['tn_format'] = 'voor het bestandsformaat'; $lang['tn_no_missing'] = 'Geen ontbrekende thumbnail'; $lang['tn_no_support'] = 'Afbeelding is niet bereikbaar of er is geen support'; $lang['tn_params_GD'] = 'GD versie'; -$lang['tn_params_create'] = 'genereer'; $lang['tn_params_title'] = 'Miniatuur parameters'; $lang['tn_results_gen_time'] = 'genereerd in'; $lang['tn_results_title'] = 'Resultaat van verkleinen'; @@ -537,7 +534,6 @@ $lang['ws_Request'] = ' Vraag '; $lang['ws_Limit'] = ' Limiet '; $lang['ws_Comment'] = ' Commentaar '; $lang['Modify End from Now +'] = 'Verander eind vanaf hier + '; -$lang['Free comment, use it to identify your partner clearly'] = ' Vrij commentaar, gebruik dit om je partner te identificeren '; $lang['Confirmation'] = ' Bevestiging '; $lang['Delete'] = ' Verwijderen '; $lang['Confidential partner key'] = 'Vertrouwelijke partner sleutel'; @@ -572,7 +568,6 @@ $lang['Year'] = 'Jaar'; $lang['Month'] = 'Maand'; $lang['Day'] = 'Dag'; $lang['Pages seen'] = 'Pagina\'s bekeken'; -//$lang['only'] = 'alleen'; $lang['Pictures'] = 'Afbeeldingen'; $lang['High quality'] = 'Hoge kwaliteit'; $lang['time'] = 'tijd'; @@ -665,4 +660,5 @@ $lang['c13y_submit_correction'] = 'Pas geselecteerde correcties toe'; /* TODO */ $lang['c13y_anomaly_ignored_count'] = '%d anomaly has been ignored.'; /* TODO */ $lang['c13y_anomalies_ignored_count'] = '%d anomalies has been ignored.'; -?> +/* TODO */ $lang['Purge compiled templates'] = 'Purge compiled templates'; +?>
\ No newline at end of file diff --git a/language/nl_NL/common.lang.php b/language/nl_NL/common.lang.php index 188e26f6f..704c75d9a 100644 --- a/language/nl_NL/common.lang.php +++ b/language/nl_NL/common.lang.php @@ -294,21 +294,18 @@ $lang['representative'] = 'representatief'; $lang['reset'] = 'Reset'; $lang['return to homepage'] = 'terug naar de homepage'; $lang['search'] = 'Zoeken'; -$lang['search_ascending'] = 'Ascending'; $lang['search_author'] = 'Zoek naar auteur'; $lang['search_categories'] = 'Zoeken in Categorieën'; $lang['search_date'] = 'Zoeken op Datum'; $lang['search_date_from'] = 'Datum'; $lang['search_date_to'] = 'Eind-Datum'; $lang['search_date_type'] = 'Datum type'; -$lang['search_descending'] = 'Descending'; $lang['search_keywords'] = 'Zoek naar hele woorden'; $lang['search_mode_and'] = 'Zoeken naar alle woorden'; $lang['search_mode_or'] = 'Zoeken naar een woord'; $lang['search_one_clause_at_least'] = 'Lege zoekopdracht. Er is niets ingevuld.'; $lang['search_options'] = 'Zoek Opties'; $lang['search_result'] = 'Zoekresultaten'; -$lang['search_sort'] = 'Sorteer resultaten op'; $lang['search_subcats_included'] = 'Zoeken in subcategorieën'; $lang['search_title'] = 'Zoeken'; $lang['searched words : %s'] = 'zoekwoorden : %s'; diff --git a/template/yoga/admin/maintenance.tpl b/template/yoga/admin/maintenance.tpl index d9872faf0..59cf4ff82 100644 --- a/template/yoga/admin/maintenance.tpl +++ b/template/yoga/admin/maintenance.tpl @@ -1,25 +1,25 @@ -<!-- DEV TAG: not smarty migrated --> -<!-- $Id$ --> +{* $Id$ *} <div class="titrePage"> <ul class="categoryActions"> - <li><a href="{U_HELP}" onclick="popuphelp(this.href); return false;" title="{lang:Help}"><img src="{themeconf:icon_dir}/help.png" class="button" alt="(?)"></a></li> + <li><a href="{$U_HELP}" onclick="popuphelp(this.href); return false;" title="{'Help'|@translate}"><img src="{$themeconf.icon_dir}/help.png" class="button" alt="(?)"></a></li> </ul> - <h2>{lang:Maintenance}</h2> + <h2>{'Maintenance'|@translate}</h2> </div> <ul> - <li><a href="{U_MAINT_CATEGORIES}" {TAG_INPUT_ENABLED}>{lang:update categories informations}</a></li> - <li><a href="{U_MAINT_IMAGES}" {TAG_INPUT_ENABLED}>{lang:update images informations}</a></li> - <li><a href="{U_MAINT_DATABASE}" {TAG_INPUT_ENABLED}>{lang:repair and optimize database}</a></li> + <li><a href="{$U_MAINT_CATEGORIES}" {$TAG_INPUT_ENABLED}>{'update categories informations'|@translate}</a></li> + <li><a href="{$U_MAINT_IMAGES}" {$TAG_INPUT_ENABLED}>{'update images informations'|@translate}</a></li> + <li><a href="{$U_MAINT_DATABASE}" {$TAG_INPUT_ENABLED}>{'repair and optimize database'|@translate}</a></li> </ul> <ul> - <li><a href="{U_MAINT_HISTORY_DETAIL}" onclick="return confirm('{lang:Are you sure?}');" {TAG_INPUT_ENABLED}>{lang:purge history detail}</a></li> - <li><a href="{U_MAINT_HISTORY_SUMMARY}" onclick="return confirm('{lang:Are you sure?}');" {TAG_INPUT_ENABLED}>{lang:purge history summary}</a></li> - <li><a href="{U_MAINT_SESSIONS}" {TAG_INPUT_ENABLED}>{lang:purge sessions}</a></li> - <li><a href="{U_MAINT_FEEDS}" {TAG_INPUT_ENABLED}>{lang:purge never used notification feeds}</a></li> + <li><a href="{$U_MAINT_HISTORY_DETAIL}" onclick="return confirm('{'Are you sure?'|@translate}');" {$TAG_INPUT_ENABLED}>{'purge history detail'|@translate}</a></li> + <li><a href="{$U_MAINT_HISTORY_SUMMARY}" onclick="return confirm('{'Are you sure?'|@translate}');" {$TAG_INPUT_ENABLED}>{'purge history summary'|@translate}</a></li> + <li><a href="{$U_MAINT_SESSIONS}" {$TAG_INPUT_ENABLED}>{'purge sessions'|@translate}</a></li> + <li><a href="{$U_MAINT_FEEDS}" {$TAG_INPUT_ENABLED}>{'purge never used notification feeds'|@translate}</a></li> + <li><a href="{$U_MAINT_COMPILED_TEMPLATES}" {$TAG_INPUT_ENABLED}>{'Purge compiled templates'|@translate}</a></li> </ul> <ul> - <li><a href="{U_MAINT_C13Y}" {TAG_INPUT_ENABLED}>{lang:c13y_maintenance}</a></li> + <li><a href="{$U_MAINT_C13Y}" {$TAG_INPUT_ENABLED}>{'c13y_maintenance'|@translate}</a></li> </ul> diff --git a/template/yoga/search.tpl b/template/yoga/search.tpl index 1b03c34c3..dc22315a3 100644 --- a/template/yoga/search.tpl +++ b/template/yoga/search.tpl @@ -112,15 +112,6 @@ <input type="radio" name="subcats-included" value="0" />{'no'|@translate} </label></li> </ul> - <ul> - <li><label>{'search_sort'|@translate}</label></li> - <li><label> - <input type="radio" name="sd" value="AND" />{'search_ascending'|@translate} - </label></li> - <li><label> - <input type="radio" name="sd" value="d" checked="checked" />{'search_descending'|@translate} - </label></li> - </ul> </fieldset> <p> <input class="submit" type="submit" name="submit" value="{'submit'|@translate}" /> |