From cf193adfffd7143a7af6a98e3eb1b990e9d77026 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 9 Feb 2016 12:37:49 +0100 Subject: [PATCH 01/16] add phrases for category_info and document_count --- languages/ar_EG/lang.inc | 2 ++ languages/bg_BG/lang.inc | 2 ++ languages/ca_ES/lang.inc | 2 ++ languages/cs_CZ/lang.inc | 2 ++ languages/de_DE/lang.inc | 4 +++- languages/en_GB/lang.inc | 4 +++- languages/es_ES/lang.inc | 2 ++ languages/fr_FR/lang.inc | 2 ++ languages/hr_HR/lang.inc | 2 ++ languages/hu_HU/lang.inc | 2 ++ languages/it_IT/lang.inc | 2 ++ languages/ko_KR/lang.inc | 2 ++ languages/nl_NL/lang.inc | 2 ++ languages/pl_PL/lang.inc | 2 ++ languages/pt_BR/lang.inc | 2 ++ languages/ro_RO/lang.inc | 2 ++ languages/ru_RU/lang.inc | 2 ++ languages/sk_SK/lang.inc | 16 +++++++++++----- languages/sv_SE/lang.inc | 2 ++ languages/tr_TR/lang.inc | 2 ++ languages/uk_UA/lang.inc | 2 ++ languages/zh_CN/lang.inc | 2 ++ languages/zh_TW/lang.inc | 2 ++ 23 files changed, 57 insertions(+), 7 deletions(-) diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc index 2b38243e2..073e7b43d 100644 --- a/languages/ar_EG/lang.inc +++ b/languages/ar_EG/lang.inc @@ -180,6 +180,7 @@ URL: [url]', 'category' => 'قسم', 'category_exists' => '.القسم بالفعل موجود', 'category_filter' => 'اقسام فقط', +'category_info' => '', 'category_in_use' => 'هذا القسم مستخدم حاليا بواسطة مستندات.', 'category_noname' => 'لم يتم كتابة اسم القسم.', 'ca_ES' => 'الكاتالونية', @@ -286,6 +287,7 @@ Parent folder: [folder_path] المستخدم: [username] URL: [url]', 'document_comment_changed_email_subject' => '[sitename]: [name] - تم تعديل التعليق', +'document_count' => '', 'document_deleted' => 'تم مسح المستند', 'document_deleted_email' => 'تم مسح المستند', 'document_deleted_email_body' => 'تم مسح المستند diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc index 7b657e747..b34bd5a52 100644 --- a/languages/bg_BG/lang.inc +++ b/languages/bg_BG/lang.inc @@ -165,6 +165,7 @@ $text = array( 'category' => 'Категория', 'category_exists' => 'Категорията существува', 'category_filter' => 'Само категории', +'category_info' => '', 'category_in_use' => 'Тази категория се използва от документите', 'category_noname' => 'Въведете име на категорията', 'ca_ES' => '', @@ -265,6 +266,7 @@ $text = array( 'document_comment_changed_email' => '', 'document_comment_changed_email_body' => '', 'document_comment_changed_email_subject' => '', +'document_count' => '', 'document_deleted' => 'Документът изтрит', 'document_deleted_email' => 'Документът изтрит', 'document_deleted_email_body' => '', diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc index 17c620232..2d37e0cbd 100644 --- a/languages/ca_ES/lang.inc +++ b/languages/ca_ES/lang.inc @@ -170,6 +170,7 @@ URL: [url]', 'category' => 'Category', 'category_exists' => '', 'category_filter' => '', +'category_info' => '', 'category_in_use' => '', 'category_noname' => '', 'ca_ES' => '', @@ -270,6 +271,7 @@ URL: [url]', 'document_comment_changed_email' => '', 'document_comment_changed_email_body' => '', 'document_comment_changed_email_subject' => '', +'document_count' => '', 'document_deleted' => 'Document eliminat', 'document_deleted_email' => 'Document eliminat', 'document_deleted_email_body' => '', diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc index ec349e3b9..61cb085d9 100644 --- a/languages/cs_CZ/lang.inc +++ b/languages/cs_CZ/lang.inc @@ -187,6 +187,7 @@ URL: [url]', 'category' => 'Kategorie', 'category_exists' => 'Kategorie již existuje.', 'category_filter' => 'Pouze kategorie', +'category_info' => '', 'category_in_use' => 'Tato kategorie je používána v dokumentech.', 'category_noname' => 'Není zadán název kategorie.', 'ca_ES' => 'Katalánština', @@ -293,6 +294,7 @@ Nadřazená složka: [folder_path] Uživatel: [username] URL: [url]', 'document_comment_changed_email_subject' => '[sitename]: [name] - Změna komentáře', +'document_count' => '', 'document_deleted' => 'Dokument odstraněn', 'document_deleted_email' => 'Dokument odstraněn', 'document_deleted_email_body' => 'Dokument odstraněn diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc index 9bc7ca563..483385243 100644 --- a/languages/de_DE/lang.inc +++ b/languages/de_DE/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (2164), dgrutsch (21) +// Translators: Admin (2166), dgrutsch (21) $text = array( 'accept' => 'Übernehmen', @@ -192,6 +192,7 @@ URL: [url]', 'category' => 'Kategorie', 'category_exists' => 'Kategorie existiert bereits.', 'category_filter' => 'Nur Kategorien', +'category_info' => 'Information', 'category_in_use' => 'Diese Kategorie wird zur Zeit von Dokumenten verwendet.', 'category_noname' => 'Kein Kategoriename eingetragen.', 'ca_ES' => 'Katalanisch', @@ -298,6 +299,7 @@ Elternordner: [folder_path] Benutzer: [username] URL: [url]', 'document_comment_changed_email_subject' => '[sitename]: [name] - Kommentar geändert', +'document_count' => 'Anzahl der Dokumente', 'document_deleted' => 'Dokument gelöscht', 'document_deleted_email' => 'Dokument gelöscht', 'document_deleted_email_body' => 'Dokument gelöscht diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc index 4f56647e9..d449925c0 100644 --- a/languages/en_GB/lang.inc +++ b/languages/en_GB/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1299), dgrutsch (7), netixw (14) +// Translators: Admin (1301), dgrutsch (7), netixw (14) $text = array( 'accept' => 'Accept', @@ -192,6 +192,7 @@ URL: [url]', 'category' => 'Category', 'category_exists' => 'Category already exists.', 'category_filter' => 'Only categories', +'category_info' => 'Information', 'category_in_use' => 'This category is currently used by documents.', 'category_noname' => 'No category name given.', 'ca_ES' => 'Catalan', @@ -298,6 +299,7 @@ Parent folder: [folder_path] User: [username] URL: [url]', 'document_comment_changed_email_subject' => '[sitename]: [name] - Comment changed', +'document_count' => 'Number of documents', 'document_deleted' => 'Document deleted', 'document_deleted_email' => 'Document deleted', 'document_deleted_email_body' => 'Document deleted diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc index 2fd483166..558fb86d6 100644 --- a/languages/es_ES/lang.inc +++ b/languages/es_ES/lang.inc @@ -187,6 +187,7 @@ URL: [url]', 'category' => 'Categoría', 'category_exists' => 'La categoría ya existe.', 'category_filter' => 'Filtro categorías', +'category_info' => '', 'category_in_use' => 'Esta categoría está en uso por documentos.', 'category_noname' => 'No ha proporcionado un nombre de categoría.', 'ca_ES' => 'Catala', @@ -293,6 +294,7 @@ Carpeta principal: [folder_path] Usuario: [username] URL: [url]', 'document_comment_changed_email_subject' => '[sitename]: [name] - Comentario modificado', +'document_count' => '', 'document_deleted' => 'Documento eliminado', 'document_deleted_email' => 'Documento eliminado', 'document_deleted_email_body' => 'Documento eliminado diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc index 125302844..9a820d3e0 100644 --- a/languages/fr_FR/lang.inc +++ b/languages/fr_FR/lang.inc @@ -187,6 +187,7 @@ URL: [url]', 'category' => 'Catégorie', 'category_exists' => 'Catégorie déjà existante.', 'category_filter' => 'Uniquement les catégories', +'category_info' => '', 'category_in_use' => 'Cette catégorie est en cours d\'utilisation par des documents.', 'category_noname' => 'Aucun nom de catégorie fourni.', 'ca_ES' => 'Catalan', @@ -293,6 +294,7 @@ Dossier parent: [folder_path] Utilisateur: [username] URL: [url]', 'document_comment_changed_email_subject' => '[sitename]: [name] - Commentaire modifié', +'document_count' => '', 'document_deleted' => 'Document supprimé', 'document_deleted_email' => 'Document supprimé', 'document_deleted_email_body' => 'ocument supprimé diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc index 7764d7e2c..8a9915d80 100644 --- a/languages/hr_HR/lang.inc +++ b/languages/hr_HR/lang.inc @@ -192,6 +192,7 @@ Internet poveznica: [url]', 'category' => 'Kategorija', 'category_exists' => 'Kategorija već postoji.', 'category_filter' => 'Samo kategorije', +'category_info' => '', 'category_in_use' => 'Ovu kategoriju trenutno koriste dokumenti.', 'category_noname' => 'Nije dan naziv kategoriji.', 'ca_ES' => 'Katalonski', @@ -298,6 +299,7 @@ Glavna mapa: [folder_path] Korisnik: [username] Internet poveznica: [url]', 'document_comment_changed_email_subject' => '[sitename]: [name] - Promijenjen komentar', +'document_count' => '', 'document_deleted' => 'Izbrisan dokument', 'document_deleted_email' => 'Izbrisan dokument', 'document_deleted_email_body' => 'Izbrisan dokument diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc index a49075062..039327842 100644 --- a/languages/hu_HU/lang.inc +++ b/languages/hu_HU/lang.inc @@ -187,6 +187,7 @@ URL: [url]', 'category' => 'Kategória', 'category_exists' => 'Kategória már létezik', 'category_filter' => 'Kizárólag kategóriák', +'category_info' => '', 'category_in_use' => 'Dokumentumok használják ezt a kategóriát', 'category_noname' => 'Nem adott meg kategória nevet.', 'ca_ES' => 'Katalán', @@ -293,6 +294,7 @@ Szülő mappa: [folder_path] Felhasználó: [username] URL: [url]', 'document_comment_changed_email_subject' => '[sitename]: [name] - Megjegyzés módosult', +'document_count' => '', 'document_deleted' => 'Dokumentum törölve', 'document_deleted_email' => 'Dokumentum törölve', 'document_deleted_email_body' => 'Dokumentum törölve diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc index 8cf20a3c1..aeafef75d 100644 --- a/languages/it_IT/lang.inc +++ b/languages/it_IT/lang.inc @@ -193,6 +193,7 @@ URL: [url]', 'category' => 'Categoria', 'category_exists' => 'Categoria esistente.', 'category_filter' => 'Solo categorie', +'category_info' => '', 'category_in_use' => 'Questa categoria è attualmente in uso in alcuni documenti.', 'category_noname' => 'Non è stato attribuito un nome alla categoria.', 'ca_ES' => 'Catalano', @@ -299,6 +300,7 @@ Cartella: [folder_path] Utente: [username] URL: [url]', 'document_comment_changed_email_subject' => '[sitename]: [name] - Commento modificato', +'document_count' => '', 'document_deleted' => 'Documento cancellato', 'document_deleted_email' => 'Documento cancellato', 'document_deleted_email_body' => 'Cancellazione documento diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc index e7bcf3c21..383ac1dd6 100644 --- a/languages/ko_KR/lang.inc +++ b/languages/ko_KR/lang.inc @@ -194,6 +194,7 @@ URL: [url]', 'category' => '카테고리', 'category_exists' => '카테고리가 이미 존재합니다.', 'category_filter' => '카테고리', +'category_info' => '', 'category_in_use' => '이 카테고리는 현재 문서에서 사용합니다.', 'category_noname' => '주어진 카테고리명이 없음.', 'ca_ES' => '카탈로니아어', @@ -300,6 +301,7 @@ URL: [url]', 사용자: [username] URL: [url]', 'document_comment_changed_email_subject' => '[sitename] : [name] - 코멘트 변경', +'document_count' => '', 'document_deleted' => '삭제된 문서', 'document_deleted_email' => '삭제된 문서', 'document_deleted_email_body' => '삭제된 문서 diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc index fc628b760..f4a50dec9 100644 --- a/languages/nl_NL/lang.inc +++ b/languages/nl_NL/lang.inc @@ -185,6 +185,7 @@ URL: [url]', 'category' => 'Categorie', 'category_exists' => 'Categorie bestaat al.', 'category_filter' => 'Alleen categorieen', +'category_info' => '', 'category_in_use' => 'Categorie is in gebruikt door documenten.', 'category_noname' => 'Geen Categorienaam opgegeven.', 'ca_ES' => 'Catalaans', @@ -291,6 +292,7 @@ Bovenliggende map: [folder_path] Gebruiker: [username] URL: [url]', 'document_comment_changed_email_subject' => '[sitename]: [name] - Commentaar gewijzigd', +'document_count' => '', 'document_deleted' => 'Document verwijderd', 'document_deleted_email' => 'Document verwijderd', 'document_deleted_email_body' => 'Document verwijderd diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc index 0f00848fb..119a38362 100644 --- a/languages/pl_PL/lang.inc +++ b/languages/pl_PL/lang.inc @@ -180,6 +180,7 @@ URL: [url]', 'category' => 'Kategoria', 'category_exists' => 'Kategoria już istnieje.', 'category_filter' => 'Tylko w kategoriach', +'category_info' => '', 'category_in_use' => 'Ta kategoria jest aktualnie używana przez dokumenty.', 'category_noname' => 'Nie podano nazwy kategorii.', 'ca_ES' => 'Kataloński', @@ -286,6 +287,7 @@ Folder macierzysty: [folder_path] Użytkownik: [username] URL: [url]', 'document_comment_changed_email_subject' => '[sitename]: [name] - Zmiana komentarza', +'document_count' => '', 'document_deleted' => 'Dokument usunięty', 'document_deleted_email' => 'Dokument usunięty', 'document_deleted_email_body' => 'Document usunięto diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc index 912b5603a..4b27da9ff 100644 --- a/languages/pt_BR/lang.inc +++ b/languages/pt_BR/lang.inc @@ -187,6 +187,7 @@ URL: [url]', 'category' => 'Categoria', 'category_exists' => 'Categoria já existe.', 'category_filter' => 'Somente categorias', +'category_info' => '', 'category_in_use' => 'Esta categoria é usada atualmente por documentos.', 'category_noname' => 'Nenhum nome de categoria foi fornecido.', 'ca_ES' => 'Catalão', @@ -293,6 +294,7 @@ Pasta mãe: [folder_path] Usuário: [username] URL: [url]', 'document_comment_changed_email_subject' => '[sitename]: [name] - Comentário modificado', +'document_count' => '', 'document_deleted' => 'Documento deletado', 'document_deleted_email' => 'Documento eliminado', 'document_deleted_email_body' => 'Documento eliminado diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc index 04ea7efeb..dd7b97e63 100644 --- a/languages/ro_RO/lang.inc +++ b/languages/ro_RO/lang.inc @@ -192,6 +192,7 @@ URL: [url]', 'category' => 'Categorie', 'category_exists' => 'Categorie deja existentă', 'category_filter' => 'Doar categoriile', +'category_info' => '', 'category_in_use' => 'Această categorie este momentan utilizată de documente.', 'category_noname' => 'Nu s-a furnizat nici un nume categorie', 'ca_ES' => 'Catalana', @@ -298,6 +299,7 @@ Folder parinte: [folder_path] Utilizator: [username] URL: [url]', 'document_comment_changed_email_subject' => '[sitename]: [name] - Comentariu schimbat', +'document_count' => '', 'document_deleted' => 'Document șters', 'document_deleted_email' => 'Document șters', 'document_deleted_email_body' => 'Document șters diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc index dda438649..4f5c39fbc 100644 --- a/languages/ru_RU/lang.inc +++ b/languages/ru_RU/lang.inc @@ -180,6 +180,7 @@ URL: [url]', 'category' => 'Категория', 'category_exists' => 'Категория существует', 'category_filter' => 'Только категории', +'category_info' => '', 'category_in_use' => 'Эта категория используется документами', 'category_noname' => 'Введите название категории', 'ca_ES' => 'Catalan', @@ -286,6 +287,7 @@ URL: [url]', Пользователь: [username] URL: [url]', 'document_comment_changed_email_subject' => '[sitename]: изменён комментарий к «[name]»', +'document_count' => '', 'document_deleted' => 'Документ удалён', 'document_deleted_email' => 'Документ удалён', 'document_deleted_email_body' => 'Удалён документ diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc index 10c30203c..ded5a38e2 100644 --- a/languages/sk_SK/lang.inc +++ b/languages/sk_SK/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (492) +// Translators: Admin (492), destinqo (4) $text = array( 'accept' => 'Prijať', @@ -31,7 +31,11 @@ $text = array( 'access_mode_read' => 'Na čítanie', 'access_mode_readwrite' => 'Na čítanie aj zápis', 'access_permission_changed_email' => 'Pristupové prava zmenene', -'access_permission_changed_email_body' => '', +'access_permission_changed_email_body' => 'Zmenené prístupové práva +Dokument: [name] +Nadradený adresár: [folder_path] +Užívateľ: [username] +URL: [url]', 'access_permission_changed_email_subject' => '', 'according_settings' => '', 'action' => 'Operácia', @@ -69,8 +73,8 @@ $text = array( 'add_workflow_state' => '', 'admin' => 'Správca', 'admin_tools' => 'Nástroje správcu', -'all' => '', -'all_categories' => '', +'all' => 'Všetko', +'all_categories' => 'Všetky kategórie', 'all_documents' => 'Všetky dokumenty', 'all_pages' => 'Všetky', 'all_users' => 'Všetci používatelia', @@ -165,6 +169,7 @@ $text = array( 'category' => '', 'category_exists' => '', 'category_filter' => '', +'category_info' => '', 'category_in_use' => '', 'category_noname' => '', 'ca_ES' => 'Katalánština', @@ -265,6 +270,7 @@ $text = array( 'document_comment_changed_email' => '', 'document_comment_changed_email_body' => '', 'document_comment_changed_email_subject' => '', +'document_count' => '', 'document_deleted' => 'Dokument zmazaný', 'document_deleted_email' => 'Dokument zmazany', 'document_deleted_email_body' => '', @@ -486,7 +492,7 @@ $text = array( 'lock_message' => 'Tento dokument zamkol [username].
Iba oprávnení používatelia ho môžu odomknúť (pozri koniec stránky).', 'lock_status' => 'Stav', 'login' => '', -'login_disabled_text' => '', +'login_disabled_text' => 'Vaše konto bolo zakázané, pravdepodobne veľa pokusov o prihlásenie zlyhalo.', 'login_disabled_title' => '', 'login_error_text' => 'Chyba pri prihlasovaní. ID používateľa alebo heslo je nesprávne.', 'login_error_title' => 'Chyba pri prihlasovaní', diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc index f8408969d..28989645b 100644 --- a/languages/sv_SE/lang.inc +++ b/languages/sv_SE/lang.inc @@ -180,6 +180,7 @@ URL: [url]', 'category' => 'Kategori', 'category_exists' => 'Kategorin finns redan.', 'category_filter' => 'Bara kategorier', +'category_info' => '', 'category_in_use' => 'Denna kategori används av ett dokument.', 'category_noname' => 'Inget kategorinamn angivet', 'ca_ES' => 'katalonska', @@ -286,6 +287,7 @@ Kommentar: [new_comment] Användare: [username] URL: [url]', 'document_comment_changed_email_subject' => '[sitename]: [name] - Kommentar ändrat', +'document_count' => '', 'document_deleted' => 'Dokumentet raderades', 'document_deleted_email' => 'Dokument har raderats', 'document_deleted_email_body' => 'Dokument har raderats diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc index c76dfefd6..c7c2654da 100644 --- a/languages/tr_TR/lang.inc +++ b/languages/tr_TR/lang.inc @@ -186,6 +186,7 @@ URL: [url]', 'category' => 'Kategori', 'category_exists' => 'Kategori zaten mevcut.', 'category_filter' => 'Sadece kategori', +'category_info' => '', 'category_in_use' => 'Bu kategoride dokümanlar mevcut.', 'category_noname' => 'Kategori ismi verilmedi.', 'ca_ES' => 'Katalanca', @@ -292,6 +293,7 @@ Açıklama: [new_comment] Kullanıcı: [username] URL: [url]', 'document_comment_changed_email_subject' => '[sitename]: [name] - Açıklama değişti', +'document_count' => '', 'document_deleted' => 'Doküman silindi', 'document_deleted_email' => 'Doküman silindi', 'document_deleted_email_body' => 'Doküman silindi diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc index c892c7e24..f066d9b72 100644 --- a/languages/uk_UA/lang.inc +++ b/languages/uk_UA/lang.inc @@ -192,6 +192,7 @@ URL: [url]', 'category' => 'Категорія', 'category_exists' => 'Категорія існує', 'category_filter' => 'Лише категорії', +'category_info' => '', 'category_in_use' => 'Ця категорія використовується для документів', 'category_noname' => 'Введіть назву категорії', 'ca_ES' => 'Catalan', @@ -298,6 +299,7 @@ URL: [url]', Користувач: [username] URL: [url]', 'document_comment_changed_email_subject' => '[sitename]: змінено коментар «[name]»', +'document_count' => '', 'document_deleted' => 'Документ видалено', 'document_deleted_email' => 'Документ видалено', 'document_deleted_email_body' => 'Видалено докмент diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc index 616082994..1f5473288 100644 --- a/languages/zh_CN/lang.inc +++ b/languages/zh_CN/lang.inc @@ -169,6 +169,7 @@ URL: [url]', 'category' => '分类', 'category_exists' => '', 'category_filter' => '指定分类', +'category_info' => '', 'category_in_use' => '已有文件使用此分类', 'category_noname' => '', 'ca_ES' => '加泰罗尼亚语', @@ -271,6 +272,7 @@ URL: [url]', 'document_comment_changed_email' => '', 'document_comment_changed_email_body' => '', 'document_comment_changed_email_subject' => '', +'document_count' => '', 'document_deleted' => '删除文档', 'document_deleted_email' => '文档已被删除', 'document_deleted_email_body' => '', diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc index 479dd8647..c20c0ca1d 100644 --- a/languages/zh_TW/lang.inc +++ b/languages/zh_TW/lang.inc @@ -169,6 +169,7 @@ URL: [url]', 'category' => '分類', 'category_exists' => '', 'category_filter' => '指定分類', +'category_info' => '', 'category_in_use' => '已有檔使用此分類', 'category_noname' => '', 'ca_ES' => '加泰羅尼亞語', @@ -269,6 +270,7 @@ URL: [url]', 'document_comment_changed_email' => '', 'document_comment_changed_email_body' => '', 'document_comment_changed_email_subject' => '', +'document_count' => '', 'document_deleted' => '刪除文檔', 'document_deleted_email' => '文檔已被刪除', 'document_deleted_email_body' => '', From d1ffd8db1a1411cf7519669370b8099ad088571b Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 9 Feb 2016 13:12:31 +0100 Subject: [PATCH 02/16] fix getDocumentsByCategory() didn't return the documents --- SeedDMS_Core/Core/inc.ClassDocumentCategory.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SeedDMS_Core/Core/inc.ClassDocumentCategory.php b/SeedDMS_Core/Core/inc.ClassDocumentCategory.php index 7bebf6f25..0c436315e 100644 --- a/SeedDMS_Core/Core/inc.ClassDocumentCategory.php +++ b/SeedDMS_Core/Core/inc.ClassDocumentCategory.php @@ -108,7 +108,7 @@ class SeedDMS_Core_DocumentCategory { $documents = array(); foreach ($resArr as $row) { - array_push($documents, $this->_dms->getDocument($row["id"])); + array_push($documents, $this->_dms->getDocument($row["documentID"])); } return $documents; } /* }}} */ From fc9ec1d3e341b70983262a0f10adad6f5e966aac Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 9 Feb 2016 13:13:02 +0100 Subject: [PATCH 03/16] add note --- SeedDMS_Core/package.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml index 46e3c9b50..e84041e9b 100644 --- a/SeedDMS_Core/package.xml +++ b/SeedDMS_Core/package.xml @@ -30,6 +30,7 @@ - add SeedDMS_Core_Group::getNotifications() - SeedDMS_Core_DMS::getNotificationsByGroup() and SeedDMS_Core_DMS::getNotificationsByUser() are deprecated +- SeedDMS_Core_DocumentCategory::getDocumentsByCategory() now returns the documents From 75183a9d36b341793a7f31e349c29fbb5841b104 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 9 Feb 2016 17:33:23 +0100 Subject: [PATCH 04/16] check experation and set status accordingly before listing documents --- out/out.Search.php | 2 ++ views/bootstrap/class.MyDocuments.php | 10 ++++++++++ views/bootstrap/class.ViewFolder.php | 1 + 3 files changed, 13 insertions(+) diff --git a/out/out.Search.php b/out/out.Search.php index a2e79f5b0..8fa9c9add 100644 --- a/out/out.Search.php +++ b/out/out.Search.php @@ -141,6 +141,7 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"] && $settings->_enableFullSe foreach($hits as $hit) { if($tmp = $dms->getDocument($hit['document_id'])) { if($tmp->getAccessMode($user) >= M_READ) { + $tmp->verifyLastestContentExpriry(); $entries[] = $tmp; $dcount++; } @@ -368,6 +369,7 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"] && $settings->_enableFullSe if($resArr['folders']) { foreach ($resArr['folders'] as $entry) { if ($entry->getAccessMode($user) >= M_READ) { + $entry->verifyLastestContentExpriry(); $entries[] = $entry; $fcount++; } diff --git a/views/bootstrap/class.MyDocuments.php b/views/bootstrap/class.MyDocuments.php index bccf7c1c4..4d2f065bd 100644 --- a/views/bootstrap/class.MyDocuments.php +++ b/views/bootstrap/class.MyDocuments.php @@ -148,6 +148,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { if ( $st["status"]==0 && isset($docIdx[$st["documentID"]][$st["version"]]) && !in_array($st["documentID"], $dList) ) { $dList[] = $st["documentID"]; $document = $dms->getDocument($st["documentID"]); + $document->verifyLastestContentExpriry(); if ($printheader){ print ""; @@ -185,6 +186,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { if (!in_array($st["documentID"], $iRev) && $st["status"]==0 && isset($docIdx[$st["documentID"]][$st["version"]]) && !in_array($st["documentID"], $dList) /* && $docIdx[$st["documentID"]][$st["version"]]['owner'] != $user->getId() */) { $dList[] = $st["documentID"]; $document = $dms->getDocument($st["documentID"]); + $document->verifyLastestContentExpriry(); if ($printheader){ print "
"; @@ -234,6 +236,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { if ( $st["status"]==0 && isset($docIdx[$st["documentID"]][$st["version"]]) && $docIdx[$st["documentID"]][$st["version"]]['status'] == S_DRAFT_APP) { $document = $dms->getDocument($st["documentID"]); + $document->verifyLastestContentExpriry(); if ($printheader){ print "
"; @@ -270,6 +273,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { if (!in_array($st["documentID"], $iRev) && $st["status"]==0 && isset($docIdx[$st["documentID"]][$st["version"]]) && $docIdx[$st["documentID"]][$st["version"]]['status'] == S_DRAFT_APP /* && $docIdx[$st["documentID"]][$st["version"]]['owner'] != $user->getId() */) { $document = $dms->getDocument($st["documentID"]); + $document->verifyLastestContentExpriry(); if ($printheader){ print "
"; print "\n\n"; @@ -365,6 +369,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { foreach ($resArr as $res) { $document = $dms->getDocument($res["documentID"]); + $document->verifyLastestContentExpriry(); // verify expiry if ( $res["expires"] && time()>$res["expires"]+24*60*60 ){ @@ -475,6 +480,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { if ( isset($docIdx[$st["document"]][$st["version"]]) && !in_array($st["document"], $dList) ) { $dList[] = $st["document"]; $document = $dms->getDocument($st["document"]); + $document->verifyLastestContentExpriry(); if ($printheader){ print "
"; @@ -512,6 +518,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { if (!in_array($st["document"], $iRev) && isset($docIdx[$st["document"]][$st["version"]]) && !in_array($st["document"], $dList) /* && $docIdx[$st["documentID"]][$st["version"]]['owner'] != $user->getId() */) { $dList[] = $st["document"]; $document = $dms->getDocument($st["document"]); + $document->verifyLastestContentExpriry(); if ($printheader){ print "
"; @@ -597,6 +604,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { foreach ($resArr as $res) { $document = $dms->getDocument($res["documentID"]); + $document->verifyLastestContentExpriry(); // verify expiry if ( $res["expires"] && time()>$res["expires"]+24*60*60 ){ @@ -673,6 +681,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { foreach ($resArr as $res) { $document = $dms->getDocument($res["documentID"]); + $document->verifyLastestContentExpriry(); // verify expiry if ( $res["expires"] && time()>$res["expires"]+24*60*60 ){ @@ -770,6 +779,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { $previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth); foreach ($resArr as $res) { $document = $dms->getDocument($res["documentID"]); + $document->verifyLastestContentExpriry(); // verify expiry if ( $res["expires"] && time()>$res["expires"]+24*60*60 ){ diff --git a/views/bootstrap/class.ViewFolder.php b/views/bootstrap/class.ViewFolder.php index 5f8150db1..ceb9178c0 100644 --- a/views/bootstrap/class.ViewFolder.php +++ b/views/bootstrap/class.ViewFolder.php @@ -259,6 +259,7 @@ class SeedDMS_View_ViewFolder extends SeedDMS_Bootstrap_Style { $previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth); foreach($documents as $document) { + $document->verifyLastestContentExpriry(); echo $this->documentListRow($document, $previewer); } From e68b30462771f0854e67a3aef9fce10316c9cba1 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 9 Feb 2016 17:34:14 +0100 Subject: [PATCH 05/16] add entry for 4.3.24 --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index cc5bca595..40b9963db 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -9,6 +9,7 @@ - default search method can be set (fulltext, database) - further pages with content security policy turned on - various translation updates +- check for document expiration when showing search result and folder content -------------------------------------------------------------------------------- Changes in version 4.3.23 From 552dc07599202b6fa8cb8e34e6c5eac2c2d91f27 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 10 Feb 2016 09:57:58 +0100 Subject: [PATCH 06/16] add phrase 'documents_locked' --- languages/ar_EG/lang.inc | 1 + languages/bg_BG/lang.inc | 1 + languages/ca_ES/lang.inc | 1 + languages/cs_CZ/lang.inc | 1 + languages/de_DE/lang.inc | 3 ++- languages/en_GB/lang.inc | 3 ++- languages/es_ES/lang.inc | 1 + languages/fr_FR/lang.inc | 1 + languages/hr_HR/lang.inc | 1 + languages/hu_HU/lang.inc | 1 + languages/it_IT/lang.inc | 1 + languages/ko_KR/lang.inc | 1 + languages/nl_NL/lang.inc | 1 + languages/pl_PL/lang.inc | 1 + languages/pt_BR/lang.inc | 1 + languages/ro_RO/lang.inc | 1 + languages/ru_RU/lang.inc | 1 + languages/sk_SK/lang.inc | 1 + languages/sv_SE/lang.inc | 1 + languages/tr_TR/lang.inc | 1 + languages/uk_UA/lang.inc | 1 + languages/zh_CN/lang.inc | 1 + languages/zh_TW/lang.inc | 1 + 23 files changed, 25 insertions(+), 2 deletions(-) diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc index 073e7b43d..880e7af9c 100644 --- a/languages/ar_EG/lang.inc +++ b/languages/ar_EG/lang.inc @@ -268,6 +268,7 @@ URL: [url]', 'documents' => 'المستندات', 'documents_checked_out_by_you' => '', 'documents_in_process' => 'مستندات رهن المعالجة', +'documents_locked' => '', 'documents_locked_by_you' => 'المستندات محمية من التعديل بواسطتك', 'documents_only' => 'مستندات فقط', 'documents_to_approve' => 'مستندات في انتظار الموافقة', diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc index b34bd5a52..41134f7fb 100644 --- a/languages/bg_BG/lang.inc +++ b/languages/bg_BG/lang.inc @@ -253,6 +253,7 @@ $text = array( 'documents' => 'Документи', 'documents_checked_out_by_you' => '', 'documents_in_process' => 'Документи в процес на работа', +'documents_locked' => '', 'documents_locked_by_you' => 'Документи, блокирани от Вас', 'documents_only' => 'Само документи', 'documents_to_approve' => 'Документи, чакащи Вашето утвърждаване', diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc index 2d37e0cbd..18ff80724 100644 --- a/languages/ca_ES/lang.inc +++ b/languages/ca_ES/lang.inc @@ -258,6 +258,7 @@ URL: [url]', 'documents' => 'Documents', 'documents_checked_out_by_you' => '', 'documents_in_process' => 'Documents en procés', +'documents_locked' => '', 'documents_locked_by_you' => 'Documents bloquejats per vostè', 'documents_only' => '', 'documents_to_approve' => 'Documents en espera d\'aprovació d\'usuaris', diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc index 61cb085d9..0838080e4 100644 --- a/languages/cs_CZ/lang.inc +++ b/languages/cs_CZ/lang.inc @@ -275,6 +275,7 @@ URL: [url]', 'documents' => 'Dokumenty', 'documents_checked_out_by_you' => '', 'documents_in_process' => 'Zpracovávané dokumenty', +'documents_locked' => '', 'documents_locked_by_you' => 'Vámi uzamčené dokumenty', 'documents_only' => 'Pouze dokumenty', 'documents_to_approve' => 'Dokumenty čekající na schválení uživatele', diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc index 483385243..046ee57da 100644 --- a/languages/de_DE/lang.inc +++ b/languages/de_DE/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (2166), dgrutsch (21) +// Translators: Admin (2167), dgrutsch (21) $text = array( 'accept' => 'Übernehmen', @@ -280,6 +280,7 @@ URL: [url]', 'documents' => 'Dokumente', 'documents_checked_out_by_you' => 'Von mir ausgecheckte Dokumente', 'documents_in_process' => 'Dokumente in Bearbeitung', +'documents_locked' => 'Gesperrte Dokumente', 'documents_locked_by_you' => 'Von mir gesperrte Dokumente', 'documents_only' => 'Nur Dokumente', 'documents_to_approve' => 'Freigabe erforderlich', diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc index d449925c0..e28aac232 100644 --- a/languages/en_GB/lang.inc +++ b/languages/en_GB/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1301), dgrutsch (7), netixw (14) +// Translators: Admin (1302), dgrutsch (7), netixw (14) $text = array( 'accept' => 'Accept', @@ -280,6 +280,7 @@ URL: [url]', 'documents' => 'Documents', 'documents_checked_out_by_you' => 'Documents checked out by you', 'documents_in_process' => 'Documents In Process', +'documents_locked' => 'Locked documents', 'documents_locked_by_you' => 'Documents locked by you', 'documents_only' => 'Documents only', 'documents_to_approve' => 'Documents awaiting your approval', diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc index 558fb86d6..fd7d5e81a 100644 --- a/languages/es_ES/lang.inc +++ b/languages/es_ES/lang.inc @@ -275,6 +275,7 @@ URL: [url]', 'documents' => 'Documentos', 'documents_checked_out_by_you' => '', 'documents_in_process' => 'Documentos en proceso', +'documents_locked' => '', 'documents_locked_by_you' => 'Documentos bloqueados por usted', 'documents_only' => 'Solo documentos', 'documents_to_approve' => 'Documentos en espera de aprobación de usuarios', diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc index 9a820d3e0..57682e2b2 100644 --- a/languages/fr_FR/lang.inc +++ b/languages/fr_FR/lang.inc @@ -275,6 +275,7 @@ URL: [url]', 'documents' => 'Documents', 'documents_checked_out_by_you' => '', 'documents_in_process' => 'Documents en cours', +'documents_locked' => '', 'documents_locked_by_you' => 'Documents verrouillés', 'documents_only' => 'Documents uniquement', 'documents_to_approve' => 'Documents en attente d\'approbation', diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc index 8a9915d80..3aa90b435 100644 --- a/languages/hr_HR/lang.inc +++ b/languages/hr_HR/lang.inc @@ -280,6 +280,7 @@ Internet poveznica: [url]', 'documents' => 'Dokumenti', 'documents_checked_out_by_you' => 'Dokumenti koje ste Vi odjavili', 'documents_in_process' => 'Dokumenti u postupku', +'documents_locked' => '', 'documents_locked_by_you' => 'Dokumenti koje ste vi zaključali', 'documents_only' => 'Samo dokumenti', 'documents_to_approve' => 'Dokumenti koji čekaju vaše odobrenje', diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc index 039327842..3c8610b1e 100644 --- a/languages/hu_HU/lang.inc +++ b/languages/hu_HU/lang.inc @@ -275,6 +275,7 @@ URL: [url]', 'documents' => 'Dokumentumok', 'documents_checked_out_by_you' => '', 'documents_in_process' => 'Feldolgozás alatt lévő dokumentumok', +'documents_locked' => '', 'documents_locked_by_you' => 'Ön által zárolt dokumentumok', 'documents_only' => 'Csak dokumentumok', 'documents_to_approve' => 'Jóváhagyására váró dokumentumok', diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc index aeafef75d..f70249847 100644 --- a/languages/it_IT/lang.inc +++ b/languages/it_IT/lang.inc @@ -281,6 +281,7 @@ URL: [url]', 'documents' => 'Documenti', 'documents_checked_out_by_you' => 'Documenti approvati da te', 'documents_in_process' => 'Documenti in lavorazione', +'documents_locked' => '', 'documents_locked_by_you' => 'Documenti bloccati da te', 'documents_only' => 'Solo documenti', 'documents_to_approve' => 'Documenti in attesa della tua approvazione', diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc index 383ac1dd6..0d09478f2 100644 --- a/languages/ko_KR/lang.inc +++ b/languages/ko_KR/lang.inc @@ -282,6 +282,7 @@ URL: [url]', 'documents' => '문서', 'documents_checked_out_by_you' => '당신으로 부터 문서가 체크아웃 되었습니다.', 'documents_in_process' => '진행중인 문서', +'documents_locked' => '', 'documents_locked_by_you' => '당신에 의해 잠긴 문서', 'documents_only' => '문서', 'documents_to_approve' => '당신의 승인을 기다리는 문서들', diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc index f4a50dec9..8370b90ee 100644 --- a/languages/nl_NL/lang.inc +++ b/languages/nl_NL/lang.inc @@ -273,6 +273,7 @@ URL: [url]', 'documents' => 'Documenten', 'documents_checked_out_by_you' => '', 'documents_in_process' => 'Documenten in behandeling', +'documents_locked' => '', 'documents_locked_by_you' => 'Documenten door U geblokkeerd', 'documents_only' => 'Alleen documenten', 'documents_to_approve' => 'Documenten die wachten op uw goedkeuring', diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc index 119a38362..dba4fbc87 100644 --- a/languages/pl_PL/lang.inc +++ b/languages/pl_PL/lang.inc @@ -268,6 +268,7 @@ URL: [url]', 'documents' => 'Dokumenty', 'documents_checked_out_by_you' => '', 'documents_in_process' => 'Dokumenty procesowane', +'documents_locked' => '', 'documents_locked_by_you' => 'Dokumenty zablokowane przez Ciebie', 'documents_only' => 'Tylko dokumenty', 'documents_to_approve' => 'Dokumenty oczekujące na Twoje zatwierdzenie', diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc index 4b27da9ff..77493f776 100644 --- a/languages/pt_BR/lang.inc +++ b/languages/pt_BR/lang.inc @@ -275,6 +275,7 @@ URL: [url]', 'documents' => 'Documentos', 'documents_checked_out_by_you' => '', 'documents_in_process' => 'Documentos em Processo', +'documents_locked' => '', 'documents_locked_by_you' => 'Documentos bloqueados por você', 'documents_only' => 'Somente documentos', 'documents_to_approve' => 'Documents Awaiting User\'s Approval', diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc index dd7b97e63..148aed14c 100644 --- a/languages/ro_RO/lang.inc +++ b/languages/ro_RO/lang.inc @@ -280,6 +280,7 @@ URL: [url]', 'documents' => 'Documente', 'documents_checked_out_by_you' => 'Documente verificate de tine', 'documents_in_process' => 'Documente în procesare', +'documents_locked' => '', 'documents_locked_by_you' => 'Documente blocate de tine', 'documents_only' => 'Doar documente', 'documents_to_approve' => 'Documente care așteaptă aprobarea dumneavoastră', diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc index 4f5c39fbc..872b49a32 100644 --- a/languages/ru_RU/lang.inc +++ b/languages/ru_RU/lang.inc @@ -268,6 +268,7 @@ URL: [url]', 'documents' => 'док.', 'documents_checked_out_by_you' => '', 'documents_in_process' => 'Документы в работе', +'documents_locked' => '', 'documents_locked_by_you' => 'Документы, заблокированные вами', 'documents_only' => 'только документы', 'documents_to_approve' => 'Документы, ожидающие вашего утверждения', diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc index ded5a38e2..577d1503a 100644 --- a/languages/sk_SK/lang.inc +++ b/languages/sk_SK/lang.inc @@ -257,6 +257,7 @@ URL: [url]', 'documents' => 'Dokumenty', 'documents_checked_out_by_you' => '', 'documents_in_process' => 'Dokumenty v spracovaní', +'documents_locked' => '', 'documents_locked_by_you' => 'Vami uzamknuté dokumenty', 'documents_only' => '', 'documents_to_approve' => 'Dokumenty čakajúce na schválenie používateľa', diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc index 28989645b..6f7418cc7 100644 --- a/languages/sv_SE/lang.inc +++ b/languages/sv_SE/lang.inc @@ -268,6 +268,7 @@ URL: [url]', 'documents' => 'Dokument', 'documents_checked_out_by_you' => '', 'documents_in_process' => 'Dokument i bearbetning', +'documents_locked' => '', 'documents_locked_by_you' => 'Dokument som du har låst', 'documents_only' => 'Bara dokument', 'documents_to_approve' => 'Dokument som du behöver godkänna', diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc index c7c2654da..9c4148ff0 100644 --- a/languages/tr_TR/lang.inc +++ b/languages/tr_TR/lang.inc @@ -274,6 +274,7 @@ URL: [url]', 'documents' => 'Dokümanlar', 'documents_checked_out_by_you' => '', 'documents_in_process' => 'İşlemdeki Dokümanlar', +'documents_locked' => '', 'documents_locked_by_you' => 'Doküman sizin tarafınızdan kilitlendi', 'documents_only' => 'Sadece dokümanlar', 'documents_to_approve' => 'Onayınızı bekleyen dokümanlar', diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc index f066d9b72..080155512 100644 --- a/languages/uk_UA/lang.inc +++ b/languages/uk_UA/lang.inc @@ -280,6 +280,7 @@ URL: [url]', 'documents' => 'док.', 'documents_checked_out_by_you' => 'Документи на Обробці у вас', 'documents_in_process' => 'Документи в роботі', +'documents_locked' => '', 'documents_locked_by_you' => 'Документи, які ви заблокували', 'documents_only' => 'лише документи', 'documents_to_approve' => 'Докумети, які чекають вашого затвердження', diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc index 1f5473288..b0894c261 100644 --- a/languages/zh_CN/lang.inc +++ b/languages/zh_CN/lang.inc @@ -259,6 +259,7 @@ URL: [url]', 'documents' => '文档', 'documents_checked_out_by_you' => '', 'documents_in_process' => '待处理文档', +'documents_locked' => '', 'documents_locked_by_you' => '被您锁定的文档', 'documents_only' => '指定文件', 'documents_to_approve' => '待您审核的文档', diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc index c20c0ca1d..3b3060201 100644 --- a/languages/zh_TW/lang.inc +++ b/languages/zh_TW/lang.inc @@ -257,6 +257,7 @@ URL: [url]', 'documents' => '文檔', 'documents_checked_out_by_you' => '', 'documents_in_process' => '待處理文檔', +'documents_locked' => '', 'documents_locked_by_you' => '被您鎖定的文檔', 'documents_only' => '指定檔', 'documents_to_approve' => '待您審核的文檔', From 625462712dae12076523c5b3ff3387ab7905d777 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 10 Feb 2016 10:03:21 +0100 Subject: [PATCH 07/16] replace comment in german, fix typo --- SeedDMS_Core/Core/inc.ClassUser.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SeedDMS_Core/Core/inc.ClassUser.php b/SeedDMS_Core/Core/inc.ClassUser.php index 52ab819b6..3ae0cfbe1 100644 --- a/SeedDMS_Core/Core/inc.ClassUser.php +++ b/SeedDMS_Core/Core/inc.ClassUser.php @@ -483,7 +483,7 @@ class SeedDMS_Core_User { return false; } - //Evtl. von diesem Benutzer gelockte Dokumente werden freigegeben + // unlock documents locked by the user $queryStr = "DELETE FROM tblDocumentLocks WHERE userID = " . $this->_id; if (!$db->getResult($queryStr)) { $db->rollbackTransaction(); @@ -806,7 +806,7 @@ class SeedDMS_Core_User { * same is true for the version of a document which limits the list * further. * - * For a detaile description of the result array see + * For a detailed description of the result array see * {link SeedDMS_Core_User::getApprovalStatus} which does the same for * approvals. * From c15b7c48022b8f61760e35b8f88c9baf5e423ab0 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 10 Feb 2016 10:03:56 +0100 Subject: [PATCH 08/16] take out commented code --- views/bootstrap/class.GroupMgr.php | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/views/bootstrap/class.GroupMgr.php b/views/bootstrap/class.GroupMgr.php index 292376b31..3c8d359fd 100644 --- a/views/bootstrap/class.GroupMgr.php +++ b/views/bootstrap/class.GroupMgr.php @@ -116,21 +116,6 @@ $(document).ready( function() { foreach($reviewstatus as $rv) { if($rv['status'] == 0) { $i++; - /* - $document = $dms->getDocument($rv['documentID']); - $latestContent = $document->getLatestContent(); - $previewer->createPreview($latestContent); - echo ""; - print ""; - print ""; - echo ""; - */ } } echo ""; @@ -278,7 +263,7 @@ $(document).ready( function() {
: -
\n"; + $documents = $seluser->getDocumentsLocked(); + echo "\n"; + $reviewStatus = $seluser->getReviewStatus(); + if($reviewStatus['indstatus']) { + $i = 0; + foreach($reviewStatus['indstatus'] as $rv) { + if($rv['status'] == 0) { + $i++; + } + } + echo "\n"; + } + $approvalStatus = $seluser->getApprovalStatus(); + if($approvalStatus['indstatus']) { + $i = 0; + foreach($approvalStatus['indstatus'] as $rv) { + if($rv['status'] == 0) { + $i++; + } + } + echo "\n"; + } $sessions = $sessionmgr->getUserSessions($seluser); if($sessions) { $session = array_shift($sessions); echo "\n"; } echo "
"; - if($previewer->hasPreview($latestContent)) { - print "getID()."&version=".$latestContent->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; - } else { - print "getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; - } - print "getID()."¤ttab=revapp\">".htmlspecialchars($document->getName())."
".getMLText('pending_reviews')."".$i."
".getMLText('documents')."".count($documents)."
".getMLText('documents_locked')."".count($documents)."
".getMLText('pending_reviews')."".$i."
".getMLText('pending_approvals')."".$i."
".getMLText('lastaccess')."".getLongReadableDate($session->getLastAccess())."
"; + + echo "getID()."\" class=\"btn btn-primary\">".getMLText("substitute_user")."\n"; } } /* }}} */ @@ -429,7 +453,7 @@ $(document).ready( function() {
: -