diff options
Diffstat (limited to 'apps/files_versions')
40 files changed, 89 insertions, 163 deletions
diff --git a/apps/files_versions/history.php b/apps/files_versions/history.php index 437a3fec065..719a7208fed 100644 --- a/apps/files_versions/history.php +++ b/apps/files_versions/history.php @@ -59,7 +59,8 @@ if ( isset( $_GET['path'] ) ) { // show the history only if there is something to show $count = 999; //show the newest revisions - if( ($versions = OCA\Files_Versions\Storage::getVersions( $path, $count)) ) { + list ($uid, $filename) = OCA\Files_Versions\Storage::getUidAndFilename($path); + if( ($versions = OCA\Files_Versions\Storage::getVersions($uid, $filename, $count)) ) { $tmpl->assign( 'versions', array_reverse( $versions ) ); diff --git a/apps/files_versions/js/versions.js b/apps/files_versions/js/versions.js index b82b9001fdb..a5b24417483 100644 --- a/apps/files_versions/js/versions.js +++ b/apps/files_versions/js/versions.js @@ -32,7 +32,7 @@ $(document).ready(function(){ }); function goToVersionPage(url){ - window.location(url); + window.location.assign(url); } function createVersionsDropdown(filename, files) { diff --git a/apps/files_versions/l10n/ar.php b/apps/files_versions/l10n/ar.php index 1f1f3100405..b84445972d3 100644 --- a/apps/files_versions/l10n/ar.php +++ b/apps/files_versions/l10n/ar.php @@ -1,5 +1,3 @@ <?php $TRANSLATIONS = array( -"History" => "السجل الزمني", -"Files Versioning" => "أصدرة الملفات", -"Enable" => "تفعيل" +"Versions" => "الإصدارات" ); diff --git a/apps/files_versions/l10n/bg_BG.php b/apps/files_versions/l10n/bg_BG.php index 6ecf12d0b00..6a1882c2bfd 100644 --- a/apps/files_versions/l10n/bg_BG.php +++ b/apps/files_versions/l10n/bg_BG.php @@ -1,4 +1,3 @@ <?php $TRANSLATIONS = array( -"History" => "История", -"Enable" => "Включено" +"Versions" => "Версии" ); diff --git a/apps/files_versions/l10n/bn_BD.php b/apps/files_versions/l10n/bn_BD.php index dffa4d79a06..f3b0071a356 100644 --- a/apps/files_versions/l10n/bn_BD.php +++ b/apps/files_versions/l10n/bn_BD.php @@ -1,5 +1,3 @@ <?php $TRANSLATIONS = array( -"History" => "ইতিহাস", -"Files Versioning" => "ফাইল ভার্সন করা", -"Enable" => "সক্রিয় " +"Versions" => "ভার্সন" ); diff --git a/apps/files_versions/l10n/ca.php b/apps/files_versions/l10n/ca.php index fc900c47dc7..433d974c8cb 100644 --- a/apps/files_versions/l10n/ca.php +++ b/apps/files_versions/l10n/ca.php @@ -6,8 +6,6 @@ "File %s could not be reverted to version %s" => "El fitxer %s no s'ha pogut revertir a la versió %s", "No old versions available" => "No hi ha versións antigues disponibles", "No path specified" => "No heu especificat el camí", -"History" => "Historial", -"Revert a file to a previous version by clicking on its revert button" => "Reverteix un fitxer a una versió anterior fent clic en el seu botó de reverteix", -"Files Versioning" => "Fitxers de Versions", -"Enable" => "Habilita" +"Versions" => "Versions", +"Revert a file to a previous version by clicking on its revert button" => "Reverteix un fitxer a una versió anterior fent clic en el seu botó de reverteix" ); diff --git a/apps/files_versions/l10n/cs_CZ.php b/apps/files_versions/l10n/cs_CZ.php index 22d4a2ad827..087d800137e 100644 --- a/apps/files_versions/l10n/cs_CZ.php +++ b/apps/files_versions/l10n/cs_CZ.php @@ -6,8 +6,6 @@ "File %s could not be reverted to version %s" => "Soubor %s nemohl být navrácen na verzi %s", "No old versions available" => "Nejsou dostupné žádné starší verze", "No path specified" => "Nezadána cesta", -"History" => "Historie", -"Revert a file to a previous version by clicking on its revert button" => "Navraťte soubor do předchozí verze kliknutím na tlačítko navrátit", -"Files Versioning" => "Verzování souborů", -"Enable" => "Povolit" +"Versions" => "Verze", +"Revert a file to a previous version by clicking on its revert button" => "Navraťte soubor do předchozí verze kliknutím na tlačítko navrátit" ); diff --git a/apps/files_versions/l10n/da.php b/apps/files_versions/l10n/da.php index 93fcb9c99cf..76ababe665a 100644 --- a/apps/files_versions/l10n/da.php +++ b/apps/files_versions/l10n/da.php @@ -6,8 +6,5 @@ "File %s could not be reverted to version %s" => "Filen %s blev genskabt til version: %s", "No old versions available" => "Ingen gamle version tilgængelige", "No path specified" => "Ingen sti specificeret", -"History" => "Historik", -"Revert a file to a previous version by clicking on its revert button" => "Genskab en fil til en tidligere version ved at klikke på denne genskab knap.", -"Files Versioning" => "Versionering af filer", -"Enable" => "Aktiver" +"Revert a file to a previous version by clicking on its revert button" => "Genskab en fil til en tidligere version ved at klikke på denne genskab knap." ); diff --git a/apps/files_versions/l10n/de.php b/apps/files_versions/l10n/de.php index d7427fbbbf2..c34a8c1fd3e 100644 --- a/apps/files_versions/l10n/de.php +++ b/apps/files_versions/l10n/de.php @@ -6,8 +6,6 @@ "File %s could not be reverted to version %s" => "Datei %s konnte nicht auf Version %s zurückgesetzt werden", "No old versions available" => "Keine älteren Versionen verfügbar", "No path specified" => "Kein Pfad angegeben", -"History" => "Historie", -"Revert a file to a previous version by clicking on its revert button" => "Setze eine Datei durch klicken auf den Zurücksetzen Button zurück", -"Files Versioning" => "Dateiversionierung", -"Enable" => "Aktivieren" +"Versions" => "Versionen", +"Revert a file to a previous version by clicking on its revert button" => "Setze eine Datei durch klicken auf den Zurücksetzen Button zurück" ); diff --git a/apps/files_versions/l10n/de_DE.php b/apps/files_versions/l10n/de_DE.php index ba849c5ea87..c0b2f2a83f7 100644 --- a/apps/files_versions/l10n/de_DE.php +++ b/apps/files_versions/l10n/de_DE.php @@ -6,8 +6,6 @@ "File %s could not be reverted to version %s" => "Die Datei %s konnte nicht zur Version %s zurückgesetzt werden", "No old versions available" => "Keine älteren Versionen verfügbar", "No path specified" => "Kein Pfad angegeben", -"History" => "Historie", -"Revert a file to a previous version by clicking on its revert button" => "Setze eine Datei durch Klicken auf den Zurücksetzen-Button auf eine frühere Version zurück", -"Files Versioning" => "Dateiversionierung", -"Enable" => "Aktivieren" +"Versions" => "Versionen", +"Revert a file to a previous version by clicking on its revert button" => "Setze eine Datei durch Klicken auf den Zurücksetzen-Button auf eine frühere Version zurück" ); diff --git a/apps/files_versions/l10n/el.php b/apps/files_versions/l10n/el.php index 8b7ecf085fb..6e1900b233b 100644 --- a/apps/files_versions/l10n/el.php +++ b/apps/files_versions/l10n/el.php @@ -6,8 +6,5 @@ "File %s could not be reverted to version %s" => "Το αρχείο %s δεν είναι δυνατό να επαναφερθεί στην έκδοση %s", "No old versions available" => "Μη διαθέσιμες παλιές εκδόσεις", "No path specified" => "Δεν καθορίστηκε διαδρομή", -"History" => "Ιστορικό", -"Revert a file to a previous version by clicking on its revert button" => "Επαναφορά ενός αρχείου σε προηγούμενη έκδοση πατώντας στο κουμπί επαναφοράς", -"Files Versioning" => "Εκδόσεις Αρχείων", -"Enable" => "Ενεργοποίηση" +"Revert a file to a previous version by clicking on its revert button" => "Επαναφορά ενός αρχείου σε προηγούμενη έκδοση πατώντας στο κουμπί επαναφοράς" ); diff --git a/apps/files_versions/l10n/es.php b/apps/files_versions/l10n/es.php index 608e171a4b1..8c1a30f822a 100644 --- a/apps/files_versions/l10n/es.php +++ b/apps/files_versions/l10n/es.php @@ -6,8 +6,6 @@ "File %s could not be reverted to version %s" => "El archivo %s no puede ser revertido a la version %s", "No old versions available" => "No hay versiones antiguas disponibles", "No path specified" => "Ruta no especificada", -"History" => "Historial", -"Revert a file to a previous version by clicking on its revert button" => "Revertir un archivo a una versión anterior haciendo clic en el boton de revertir", -"Files Versioning" => "Versionado de archivos", -"Enable" => "Habilitar" +"Versions" => "Revisiones", +"Revert a file to a previous version by clicking on its revert button" => "Revertir un archivo a una versión anterior haciendo clic en el boton de revertir" ); diff --git a/apps/files_versions/l10n/es_AR.php b/apps/files_versions/l10n/es_AR.php index dc604e2a9c8..363693c913b 100644 --- a/apps/files_versions/l10n/es_AR.php +++ b/apps/files_versions/l10n/es_AR.php @@ -6,8 +6,6 @@ "File %s could not be reverted to version %s" => "El archivo %s no pudo ser revertido a la versión %s", "No old versions available" => "No hay versiones antiguas disponibles", "No path specified" => "Ruta de acceso no especificada", -"History" => "Historia", -"Revert a file to a previous version by clicking on its revert button" => "Revertí un archivo a una versión anterior haciendo click en su botón de \"revertir\"", -"Files Versioning" => "Versionado de archivos", -"Enable" => "Activar" +"Versions" => "Versiones", +"Revert a file to a previous version by clicking on its revert button" => "Revertí un archivo a una versión anterior haciendo click en su botón de \"revertir\"" ); diff --git a/apps/files_versions/l10n/et_EE.php b/apps/files_versions/l10n/et_EE.php index 4aa80c4f55e..fa2a33f9dda 100644 --- a/apps/files_versions/l10n/et_EE.php +++ b/apps/files_versions/l10n/et_EE.php @@ -2,8 +2,5 @@ "success" => "korras", "failure" => "ebaõnnestus", "No old versions available" => "Vanu versioone pole saadaval", -"No path specified" => "Asukohta pole määratud", -"History" => "Ajalugu", -"Files Versioning" => "Failide versioonihaldus", -"Enable" => "Luba" +"No path specified" => "Asukohta pole määratud" ); diff --git a/apps/files_versions/l10n/eu.php b/apps/files_versions/l10n/eu.php index d7f7a796639..2a7f279af16 100644 --- a/apps/files_versions/l10n/eu.php +++ b/apps/files_versions/l10n/eu.php @@ -6,8 +6,6 @@ "File %s could not be reverted to version %s" => "%s fitxategia ezin da %s bertsiora leheneratu", "No old versions available" => "Ez dago bertsio zaharrik eskuragarri", "No path specified" => "Ez da bidea zehaztu", -"History" => "Historia", -"Revert a file to a previous version by clicking on its revert button" => "Itzuli fitxategi bat aurreko bertsio batera leheneratu bere leheneratu botoia sakatuz", -"Files Versioning" => "Fitxategien Bertsioak", -"Enable" => "Gaitu" +"Versions" => "Bertsioak", +"Revert a file to a previous version by clicking on its revert button" => "Itzuli fitxategi bat aurreko bertsio batera leheneratu bere leheneratu botoia sakatuz" ); diff --git a/apps/files_versions/l10n/fa.php b/apps/files_versions/l10n/fa.php index 0e32ae0d891..4ec6aa1bbb4 100644 --- a/apps/files_versions/l10n/fa.php +++ b/apps/files_versions/l10n/fa.php @@ -4,8 +4,5 @@ "failure" => "شکست", "No old versions available" => "هیچ نسخه قدیمی در دسترس نیست", "No path specified" => "هیچ مسیری مشخص نشده است", -"History" => "تاریخچه", -"Revert a file to a previous version by clicking on its revert button" => "بازگردانی یک پرورنده به نسخه قدیمی اش از طریق دکمه بازگردانی امکان پذیر است", -"Files Versioning" => "نسخه بندی پرونده ها", -"Enable" => "فعال" +"Revert a file to a previous version by clicking on its revert button" => "بازگردانی یک پرورنده به نسخه قدیمی اش از طریق دکمه بازگردانی امکان پذیر است" ); diff --git a/apps/files_versions/l10n/fi_FI.php b/apps/files_versions/l10n/fi_FI.php index 61e073d4e06..0dec7fc2580 100644 --- a/apps/files_versions/l10n/fi_FI.php +++ b/apps/files_versions/l10n/fi_FI.php @@ -6,8 +6,5 @@ "File %s could not be reverted to version %s" => "Tiedoston %s palautus versioon %s epäonnistui", "No old versions available" => "Vanhoja ei ole saatavilla", "No path specified" => "Polkua ei ole määritetty", -"History" => "Historia", -"Revert a file to a previous version by clicking on its revert button" => "Palauta tiedoston edellinen versio napsauttamalla palautuspainiketta", -"Files Versioning" => "Tiedostojen versiointi", -"Enable" => "Käytä" +"Revert a file to a previous version by clicking on its revert button" => "Palauta tiedoston edellinen versio napsauttamalla palautuspainiketta" ); diff --git a/apps/files_versions/l10n/fr.php b/apps/files_versions/l10n/fr.php index 6b2cf9ba6b5..76ad8fc97a6 100644 --- a/apps/files_versions/l10n/fr.php +++ b/apps/files_versions/l10n/fr.php @@ -6,8 +6,5 @@ "File %s could not be reverted to version %s" => "Le fichier %s ne peut être restauré dans sa version %s", "No old versions available" => "Aucune ancienne version n'est disponible", "No path specified" => "Aucun chemin spécifié", -"History" => "Historique", -"Revert a file to a previous version by clicking on its revert button" => "Restaurez un fichier dans une version antérieure en cliquant sur son bouton de restauration", -"Files Versioning" => "Versionnage des fichiers", -"Enable" => "Activer" +"Revert a file to a previous version by clicking on its revert button" => "Restaurez un fichier dans une version antérieure en cliquant sur son bouton de restauration" ); diff --git a/apps/files_versions/l10n/gl.php b/apps/files_versions/l10n/gl.php index b822b223cc1..586ef8c3a68 100644 --- a/apps/files_versions/l10n/gl.php +++ b/apps/files_versions/l10n/gl.php @@ -6,8 +6,6 @@ "File %s could not be reverted to version %s" => "Non foi posíbel reverter o ficheiro %s á versión %s", "No old versions available" => "Non hai versións antigas dispoñíbeis", "No path specified" => "Non foi indicada a ruta", -"History" => "Historial", -"Revert a file to a previous version by clicking on its revert button" => "Reverta un ficheiro a unha versión anterior premendo no botón reversión", -"Files Versioning" => "Sistema de versión de ficheiros", -"Enable" => "Activar" +"Versions" => "Versións", +"Revert a file to a previous version by clicking on its revert button" => "Reverta un ficheiro a unha versión anterior premendo no botón reversión" ); diff --git a/apps/files_versions/l10n/hu_HU.php b/apps/files_versions/l10n/hu_HU.php index dcf28838158..9f7420157e1 100644 --- a/apps/files_versions/l10n/hu_HU.php +++ b/apps/files_versions/l10n/hu_HU.php @@ -6,8 +6,6 @@ "File %s could not be reverted to version %s" => "%s állományt nem sikerült átállítani erre a változatra: %s", "No old versions available" => "Nincs régebbi változat", "No path specified" => "Nincs megadva az útvonal", -"History" => "Korábbi változatok", -"Revert a file to a previous version by clicking on its revert button" => "Az állomány átállítható egy régebbi változatra, ha a gombra kattint", -"Files Versioning" => "Az állományok verzionálása", -"Enable" => "engedélyezve" +"Versions" => "Az állományok korábbi változatai", +"Revert a file to a previous version by clicking on its revert button" => "Az állomány átállítható egy régebbi változatra, ha a gombra kattint" ); diff --git a/apps/files_versions/l10n/id.php b/apps/files_versions/l10n/id.php index 6e24a05cbb8..4662aa86432 100644 --- a/apps/files_versions/l10n/id.php +++ b/apps/files_versions/l10n/id.php @@ -6,8 +6,5 @@ "File %s could not be reverted to version %s" => "Berkas %s gagal dikembalikan ke versi %s", "No old versions available" => "Versi lama tidak tersedia", "No path specified" => "Lokasi tidak ditentukan", -"History" => "riwayat", -"Revert a file to a previous version by clicking on its revert button" => "Kembalikan berkas ke versi sebelumnya dengan mengklik tombol kembalikan", -"Files Versioning" => "pembuatan versi file", -"Enable" => "aktifkan" +"Revert a file to a previous version by clicking on its revert button" => "Kembalikan berkas ke versi sebelumnya dengan mengklik tombol kembalikan" ); diff --git a/apps/files_versions/l10n/is.php b/apps/files_versions/l10n/is.php index ccb8287b71e..d165a78c31e 100644 --- a/apps/files_versions/l10n/is.php +++ b/apps/files_versions/l10n/is.php @@ -1,5 +1,3 @@ <?php $TRANSLATIONS = array( -"History" => "Saga", -"Files Versioning" => "Útgáfur af skrám", -"Enable" => "Virkja" +"Versions" => "Útgáfur" ); diff --git a/apps/files_versions/l10n/it.php b/apps/files_versions/l10n/it.php index 3289f7f68d1..bca00879993 100644 --- a/apps/files_versions/l10n/it.php +++ b/apps/files_versions/l10n/it.php @@ -6,8 +6,6 @@ "File %s could not be reverted to version %s" => "Il file %s non può essere ripristinato alla versione %s", "No old versions available" => "Non sono disponibili versioni precedenti", "No path specified" => "Nessun percorso specificato", -"History" => "Cronologia", -"Revert a file to a previous version by clicking on its revert button" => "Ripristina un file a una versione precedente facendo clic sul rispettivo pulsante di ripristino", -"Files Versioning" => "Controllo di versione dei file", -"Enable" => "Abilita" +"Versions" => "Versioni", +"Revert a file to a previous version by clicking on its revert button" => "Ripristina un file a una versione precedente facendo clic sul rispettivo pulsante di ripristino" ); diff --git a/apps/files_versions/l10n/ja_JP.php b/apps/files_versions/l10n/ja_JP.php index 16018765708..0c2dbd401c4 100644 --- a/apps/files_versions/l10n/ja_JP.php +++ b/apps/files_versions/l10n/ja_JP.php @@ -6,8 +6,6 @@ "File %s could not be reverted to version %s" => "ファイル %s をバージョン %s に戻せませんでした", "No old versions available" => "利用可能な古いバージョンはありません", "No path specified" => "パスが指定されていません", -"History" => "履歴", -"Revert a file to a previous version by clicking on its revert button" => "もとに戻すボタンをクリックすると、ファイルを過去のバージョンに戻します", -"Files Versioning" => "ファイルのバージョン管理", -"Enable" => "有効化" +"Versions" => "バージョン", +"Revert a file to a previous version by clicking on its revert button" => "もとに戻すボタンをクリックすると、ファイルを過去のバージョンに戻します" ); diff --git a/apps/files_versions/l10n/lv.php b/apps/files_versions/l10n/lv.php index 2203dc706b8..bf8d40fa0f0 100644 --- a/apps/files_versions/l10n/lv.php +++ b/apps/files_versions/l10n/lv.php @@ -6,8 +6,6 @@ "File %s could not be reverted to version %s" => "Datni %s nevarēja atgriezt uz versiju %s", "No old versions available" => "Nav pieejamu vecāku versiju", "No path specified" => "Nav norādīts ceļš", -"History" => "Vēsture", -"Revert a file to a previous version by clicking on its revert button" => "Atgriez datni uz iepriekšēju versiju, spiežot uz tās atgriešanas pogu", -"Files Versioning" => "Datņu versiju izskošana", -"Enable" => "Aktivēt" +"Versions" => "Versijas", +"Revert a file to a previous version by clicking on its revert button" => "Atgriez datni uz iepriekšēju versiju, spiežot uz tās atgriešanas pogu" ); diff --git a/apps/files_versions/l10n/mk.php b/apps/files_versions/l10n/mk.php index d3ec233fe41..6a1882c2bfd 100644 --- a/apps/files_versions/l10n/mk.php +++ b/apps/files_versions/l10n/mk.php @@ -1,5 +1,3 @@ <?php $TRANSLATIONS = array( -"History" => "Историја", -"Files Versioning" => "Верзии на датотеки", -"Enable" => "Овозможи" +"Versions" => "Версии" ); diff --git a/apps/files_versions/l10n/nl.php b/apps/files_versions/l10n/nl.php index fb1cfc3533c..c50f76c7add 100644 --- a/apps/files_versions/l10n/nl.php +++ b/apps/files_versions/l10n/nl.php @@ -6,8 +6,5 @@ "File %s could not be reverted to version %s" => "Bestand %s kon niet worden teruggedraaid naar versie %s", "No old versions available" => "Geen oudere versies beschikbaar", "No path specified" => "Geen pad opgegeven", -"History" => "Geschiedenis", -"Revert a file to a previous version by clicking on its revert button" => "Draai een bestand terug naar een voorgaande versie door te klikken op de terugdraai knop", -"Files Versioning" => "Bestand versies", -"Enable" => "Activeer" +"Revert a file to a previous version by clicking on its revert button" => "Draai een bestand terug naar een voorgaande versie door te klikken op de terugdraai knop" ); diff --git a/apps/files_versions/l10n/pl.php b/apps/files_versions/l10n/pl.php index ae3bfc4a842..68944e86760 100644 --- a/apps/files_versions/l10n/pl.php +++ b/apps/files_versions/l10n/pl.php @@ -6,8 +6,6 @@ "File %s could not be reverted to version %s" => "Plik %s nie mógł być przywrócony do wersji %s", "No old versions available" => "Nie są dostępne żadne starsze wersje", "No path specified" => "Nie podano ścieżki", -"History" => "Historia", -"Revert a file to a previous version by clicking on its revert button" => "Przywróć plik do poprzedniej wersji klikając w jego przycisk przywrócenia", -"Files Versioning" => "Wersjonowanie plików", -"Enable" => "Włącz" +"Versions" => "Wersje", +"Revert a file to a previous version by clicking on its revert button" => "Przywróć plik do poprzedniej wersji klikając w jego przycisk przywrócenia" ); diff --git a/apps/files_versions/l10n/pt_BR.php b/apps/files_versions/l10n/pt_BR.php index 9ce509c6534..f68197ef092 100644 --- a/apps/files_versions/l10n/pt_BR.php +++ b/apps/files_versions/l10n/pt_BR.php @@ -6,8 +6,5 @@ "File %s could not be reverted to version %s" => "Arquivo %s não pôde ser revertido à versão %s", "No old versions available" => "Nenhuma versão antiga disponível", "No path specified" => "Nenhum caminho especificado", -"History" => "Histórico", -"Revert a file to a previous version by clicking on its revert button" => "Reverta um arquivo a uma versão anterior clicando no botão reverter", -"Files Versioning" => "Versionamento de Arquivos", -"Enable" => "Habilitar" +"Revert a file to a previous version by clicking on its revert button" => "Reverta um arquivo a uma versão anterior clicando no botão reverter" ); diff --git a/apps/files_versions/l10n/pt_PT.php b/apps/files_versions/l10n/pt_PT.php index 629809f9556..2baccf3def8 100644 --- a/apps/files_versions/l10n/pt_PT.php +++ b/apps/files_versions/l10n/pt_PT.php @@ -6,8 +6,5 @@ "File %s could not be reverted to version %s" => "Não foi possível reverter o ficheiro %s para a versão %s", "No old versions available" => "Não existem versões mais antigas", "No path specified" => "Nenhum caminho especificado", -"History" => "Histórico", -"Revert a file to a previous version by clicking on its revert button" => "Reverter um ficheiro para uma versão anterior clicando no seu botão reverter.", -"Files Versioning" => "Versionamento de Ficheiros", -"Enable" => "Activar" +"Revert a file to a previous version by clicking on its revert button" => "Reverter um ficheiro para uma versão anterior clicando no seu botão reverter." ); diff --git a/apps/files_versions/l10n/ru.php b/apps/files_versions/l10n/ru.php index 221d24ce8d1..7377fbb5382 100644 --- a/apps/files_versions/l10n/ru.php +++ b/apps/files_versions/l10n/ru.php @@ -6,8 +6,6 @@ "File %s could not be reverted to version %s" => "Файл %s не может быть возвращён к версии %s", "No old versions available" => "Нет доступных старых версий", "No path specified" => "Путь не указан", -"History" => "История", -"Revert a file to a previous version by clicking on its revert button" => "Вернуть файл к предыдущей версии нажатием на кнопку возврата", -"Files Versioning" => "Версии файлов", -"Enable" => "Включить" +"Versions" => "Версии", +"Revert a file to a previous version by clicking on its revert button" => "Вернуть файл к предыдущей версии нажатием на кнопку возврата" ); diff --git a/apps/files_versions/l10n/sk_SK.php b/apps/files_versions/l10n/sk_SK.php index 8b46e93bb97..50e4af4d964 100644 --- a/apps/files_versions/l10n/sk_SK.php +++ b/apps/files_versions/l10n/sk_SK.php @@ -6,8 +6,6 @@ "File %s could not be reverted to version %s" => "Súbor %s nemohol byť obnovený na verziu %s", "No old versions available" => "Nie sú dostupné žiadne staršie verzie", "No path specified" => "Nevybrali ste cestu", -"History" => "História", -"Revert a file to a previous version by clicking on its revert button" => "Obnovte súbor do predošlej verzie kliknutím na tlačítko obnoviť", -"Files Versioning" => "Vytváranie verzií súborov", -"Enable" => "Zapnúť" +"Versions" => "Verzie", +"Revert a file to a previous version by clicking on its revert button" => "Obnovte súbor do predošlej verzie kliknutím na tlačítko obnoviť" ); diff --git a/apps/files_versions/l10n/sl.php b/apps/files_versions/l10n/sl.php index 7f386c9edaa..b6ad6a1e9bb 100644 --- a/apps/files_versions/l10n/sl.php +++ b/apps/files_versions/l10n/sl.php @@ -1,5 +1,3 @@ <?php $TRANSLATIONS = array( -"History" => "Zgodovina", -"Files Versioning" => "Sledenje različicam", -"Enable" => "Omogoči" +"No old versions available" => "Starejših različic ni na voljo" ); diff --git a/apps/files_versions/l10n/sv.php b/apps/files_versions/l10n/sv.php index 853644848f4..46e2c0f8bcf 100644 --- a/apps/files_versions/l10n/sv.php +++ b/apps/files_versions/l10n/sv.php @@ -6,8 +6,5 @@ "File %s could not be reverted to version %s" => "Filen %s kunde inte återställas till version %s", "No old versions available" => "Inga gamla versioner finns tillgängliga", "No path specified" => "Ingen sökväg angiven", -"History" => "Historik", -"Revert a file to a previous version by clicking on its revert button" => "Återställ en fil till en tidigare version genom att klicka på knappen", -"Files Versioning" => "Versionshantering av filer", -"Enable" => "Aktivera" +"Revert a file to a previous version by clicking on its revert button" => "Återställ en fil till en tidigare version genom att klicka på knappen" ); diff --git a/apps/files_versions/l10n/tr.php b/apps/files_versions/l10n/tr.php index 3db3a4bc822..745400d331c 100644 --- a/apps/files_versions/l10n/tr.php +++ b/apps/files_versions/l10n/tr.php @@ -6,7 +6,5 @@ "File %s could not be reverted to version %s" => "Dosya %s, %s versiyonuna döndürülemedi.", "No old versions available" => "Eski versiyonlar mevcut değil.", "No path specified" => "Yama belirtilmemiş", -"History" => "Geçmiş", -"Files Versioning" => "Dosya Sürümleri", -"Enable" => "Etkinleştir" +"Versions" => "Sürümler" ); diff --git a/apps/files_versions/l10n/uk.php b/apps/files_versions/l10n/uk.php index 861523bf6a4..bfee066c63d 100644 --- a/apps/files_versions/l10n/uk.php +++ b/apps/files_versions/l10n/uk.php @@ -6,8 +6,5 @@ "File %s could not be reverted to version %s" => "Файл %s не може бути відновлений до версії %s", "No old versions available" => "Старі версії недоступні", "No path specified" => "Шлях не вказаний", -"History" => "Історія", -"Revert a file to a previous version by clicking on its revert button" => "Відновити файл на попередню версію, натиснувши на кнопку Відновити", -"Files Versioning" => "Версії файлів", -"Enable" => "Включити" +"Revert a file to a previous version by clicking on its revert button" => "Відновити файл на попередню версію, натиснувши на кнопку Відновити" ); diff --git a/apps/files_versions/l10n/vi.php b/apps/files_versions/l10n/vi.php index 675cb841c78..f2499e7bf35 100644 --- a/apps/files_versions/l10n/vi.php +++ b/apps/files_versions/l10n/vi.php @@ -6,8 +6,5 @@ "File %s could not be reverted to version %s" => "File %s không thể khôi phục về phiên bản %s", "No old versions available" => "Không có phiên bản cũ nào", "No path specified" => "Không chỉ ra đường dẫn rõ ràng", -"History" => "Lịch sử", -"Revert a file to a previous version by clicking on its revert button" => "Khôi phục một file về phiên bản trước đó bằng cách click vào nút Khôi phục tương ứng", -"Files Versioning" => "Phiên bản tập tin", -"Enable" => "Bật " +"Revert a file to a previous version by clicking on its revert button" => "Khôi phục một file về phiên bản trước đó bằng cách click vào nút Khôi phục tương ứng" ); diff --git a/apps/files_versions/l10n/zh_CN.php b/apps/files_versions/l10n/zh_CN.php index 14301ff0c04..65d0d284a07 100644 --- a/apps/files_versions/l10n/zh_CN.php +++ b/apps/files_versions/l10n/zh_CN.php @@ -1,5 +1,11 @@ <?php $TRANSLATIONS = array( -"History" => "历史", -"Files Versioning" => "文件版本", -"Enable" => "开启" +"Could not revert: %s" => "无法恢复: %s", +"success" => "成功", +"File %s was reverted to version %s" => "文件 %s 已被恢复到历史版本 %s", +"failure" => "失败", +"File %s could not be reverted to version %s" => "文件 %s 无法被恢复到历史版本 %s", +"No old versions available" => "该文件没有历史版本", +"No path specified" => "未指定路径", +"Versions" => "版本", +"Revert a file to a previous version by clicking on its revert button" => "点击恢复按钮可将文件恢复到之前的版本" ); diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php index 12f8fdaa0dc..c37133cf32c 100644 --- a/apps/files_versions/lib/versions.php +++ b/apps/files_versions/lib/versions.php @@ -86,6 +86,7 @@ class Storage { $files_view = new \OC\Files\View('/'.$uid .'/files'); $users_view = new \OC\Files\View('/'.$uid); + $versions_view = new \OC\Files\View('/'.$uid.'/files_versions'); // check if filename is a directory if($files_view->is_dir($filename)) { @@ -99,7 +100,7 @@ class Storage { // create all parent folders $info=pathinfo($filename); - $versionsFolderName=\OCP\Config::getSystemValue('datadirectory').$users_view->getAbsolutePath('files_versions/'); + $versionsFolderName=$versions_view->getLocalFolder(''); if(!file_exists($versionsFolderName.'/'.$info['dirname'])) { mkdir($versionsFolderName.'/'.$info['dirname'], 0750, true); } @@ -130,7 +131,7 @@ class Storage { list($uid, $filename) = self::getUidAndFilename($filename); $versions_fileview = new \OC\Files\View('/'.$uid .'/files_versions'); - $abs_path = \OCP\Config::getSystemValue('datadirectory').$versions_fileview->getAbsolutePath('').$filename.'.v'; + $abs_path = $versions_fileview->getLocalFile($filename.'.v'); if( ($versions = self::getVersions($uid, $filename)) ) { $versionsSize = self::getVersionsSize($uid); if ( $versionsSize === false || $versionsSize < 0 ) { @@ -152,7 +153,7 @@ class Storage { list($uidn, $newpath) = self::getUidAndFilename($newpath); $versions_view = new \OC\Files\View('/'.$uid .'/files_versions'); $files_view = new \OC\Files\View('/'.$uid .'/files'); - $abs_newpath = \OCP\Config::getSystemValue('datadirectory').$versions_view->getAbsolutePath('').$newpath; + $abs_newpath = $versions_view->getLocalFile($newpath); if ( $files_view->is_dir($oldpath) && $versions_view->is_dir($oldpath) ) { $versions_view->rename($oldpath, $newpath); @@ -207,8 +208,8 @@ class Storage { public static function getVersions($uid, $filename, $count = 0 ) { if( \OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true' ) { $versions_fileview = new \OC\Files\View('/' . $uid . '/files_versions'); - - $versionsName = \OC_Filesystem::normalizePath(\OCP\Config::getSystemValue('datadirectory').$versions_fileview->getAbsolutePath($filename)); + $versionsName = $versions_fileview->getLocalFile($filename); + $versions = array(); // fetch for old versions $matches = glob(preg_quote($versionsName).'.v*' ); @@ -271,7 +272,7 @@ class Storage { private static function calculateSize($uid) { if( \OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true' ) { $versions_fileview = new \OC\Files\View('/'.$uid.'/files_versions'); - $versionsRoot = \OCP\Config::getSystemValue('datadirectory').$versions_fileview->getAbsolutePath(''); + $versionsRoot = $versions_fileview->getLocalFolder(''); $iterator = new \RecursiveIteratorIterator( new \RecursiveDirectoryIterator($versionsRoot), @@ -299,7 +300,7 @@ class Storage { private static function getAllVersions($uid) { if( \OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true' ) { $versions_fileview = new \OC\Files\View('/'.$uid.'/files_versions'); - $versionsRoot = \OCP\Config::getSystemValue('datadirectory').$versions_fileview->getAbsolutePath(''); + $versionsRoot = $versions_fileview->getLocalFolder(''); $iterator = new \RecursiveIteratorIterator( new \RecursiveDirectoryIterator($versionsRoot), @@ -351,15 +352,15 @@ class Storage { // get available disk space for user $quota = \OC_Preferences::getValue($uid, 'files', 'quota'); - if ( $quota === null ) { + if ( $quota === null || $quota === 'default') { $quota = \OC_Appconfig::getValue('files', 'default_quota'); } - if ( $quota === null ) { + if ( $quota === null || $quota === 'none' ) { $quota = \OC\Files\Filesystem::free_space('/') / count(\OCP\User::getUsers()); } else { $quota = \OCP\Util::computerFileSize($quota); } - + // make sure that we have the current size of the version history if ( $versionsSize === null ) { $versionsSize = self::getVersionsSize($uid); @@ -441,12 +442,12 @@ class Storage { } } - // check if enough space is available after versions are rearranged. - // if not we delete the oldest versions until we meet the size limit for versions - $numOfVersions = count($all_versions); + // Check if enough space is available after versions are rearranged. + // If not we delete the oldest versions until we meet the size limit for versions, + // but always keep the two latest versions + $numOfVersions = count($all_versions) -2 ; $i = 0; - while ($availableSpace < 0) { - if ($i = $numOfVersions-2) break; // keep at least the last version + while ($availableSpace < 0 && $i < $numOfVersions) { $versions_fileview->unlink($all_versions[$i]['path'].'.v'.$all_versions[$i]['version']); $versionsSize -= $all_versions[$i]['size']; $availableSpace += $all_versions[$i]['size']; diff --git a/apps/files_versions/templates/history.php b/apps/files_versions/templates/history.php index c450af66ad5..f7284439041 100644 --- a/apps/files_versions/templates/history.php +++ b/apps/files_versions/templates/history.php @@ -5,29 +5,29 @@ if( isset( $_['message'] ) ) { - if( isset($_['path'] ) ) echo('<strong>File: '.$_['path'] ).'</strong><br>'; - echo('<strong>'.$_['message'] ).'</strong><br>'; + if( isset($_['path'] ) ) print_unescaped('<strong>File: '.OC_Util::sanitizeHTML($_['path'])).'</strong><br>'; + print_unescaped('<strong>'.OC_Util::sanitizeHTML($_['message']) ).'</strong><br>'; }else{ if( isset( $_['outcome_stat'] ) ) { - echo( '<div id="feedback-messages" class="'.$_['outcome_stat'].'"><h3>'.$_['outcome_msg'] ).'</h3></div><br>'; + print_unescaped( '<div id="feedback-messages" class="'.OC_Util::sanitizeHTML($_['outcome_stat']).'"><h3>'.OC_Util::sanitizeHTML($_['outcome_msg']) ).'</h3></div><br>'; } - echo( '<strong>Versions of '.$_['path'] ).'</strong><br>'; - echo('<p><em>'.$l->t('Revert a file to a previous version by clicking on its revert button').'</em></p><br />'); + print_unescaped( '<strong>Versions of '.OC_Util::sanitizeHTML($_['path']) ).'</strong><br>'; + print_unescaped('<p><em>'.OC_Util::sanitizeHTML($l->t('Revert a file to a previous version by clicking on its revert button')).'</em></p><br />'); foreach ( $_['versions'] as $v ) { - echo ' '; - echo OCP\Util::formatDate( doubleval($v['version']) ); - echo ' <a href="'.OCP\Util::linkTo('files_versions', 'history.php', - array('path' => $_['path'], 'revert' => $v['version'])) .'" class="button">Revert</a><br /><br />'; + p(' '); + p(OCP\Util::formatDate( doubleval($v['version']))); + print_unescaped(' <a href="'.OCP\Util::linkTo('files_versions', 'history.php', + array('path' => $_['path'], 'revert' => $v['version'])) .'" class="button">Revert</a><br /><br />'); if ( $v['cur'] ) { - echo ' (<b>Current</b>)'; + print_unescaped(' (<b>Current</b>)'); } - echo '<br /><br />'; + print_unescaped('<br /><br />'); } } |