gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-10-31 05:11:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-4.3.x' into seeddms-5.0.x

Browse Source
This commit is contained in:
Uwe Steinmann 2017-12-07 08:58:44 +01:00
commit 49b1b83f01
4 changed files with 48 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
languages/de_DE/lang.inc
View File

@ -19,7 +19,7 @@
// along with this program; if not, write to the Free Software // along with this program; if not, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
// //
// Translators: Admin (2497), dgrutsch (22) // Translators: Admin (2498), dgrutsch (22)
$text = array( $text = array(
'2_factor_auth' => '2-Faktor Authentifizierung', '2_factor_auth' => '2-Faktor Authentifizierung',
@ -392,7 +392,6 @@ URL: [url]',
'document_title' => 'Dokument \'[documentname]\'', 'document_title' => 'Dokument \'[documentname]\'',
'document_transfered_email_body' => 'Dokument an anderen Benutzer übertragen 'document_transfered_email_body' => 'Dokument an anderen Benutzer übertragen
Dokument: [name] Dokument: [name]
Version: [version]
Neuer Besitzer: [newuser] Neuer Besitzer: [newuser]
Elternordner: [folder_path] Elternordner: [folder_path]
Benutzer: [username] Benutzer: [username]

3
languages/en_GB/lang.inc
View File

@ -19,7 +19,7 @@
// along with this program; if not, write to the Free Software // along with this program; if not, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
// //
// Translators: Admin (1625), archonwang (3), dgrutsch (9), netixw (14) // Translators: Admin (1626), archonwang (3), dgrutsch (9), netixw (14)
$text = array( $text = array(
'2_factor_auth' => '2-factor authentication', '2_factor_auth' => '2-factor authentication',
@ -392,7 +392,6 @@ URL: [url]',
'document_title' => 'Document \'[documentname]\'', 'document_title' => 'Document \'[documentname]\'',
'document_transfered_email_body' => 'Document transfer to other user 'document_transfered_email_body' => 'Document transfer to other user
Document: [name] Document: [name]
Version: [version]
New owner: [newuser] New owner: [newuser]
Parent folder: [folder_path] Parent folder: [folder_path]
User: [username] User: [username]

8
languages/fr_FR/lang.inc
View File

@ -19,7 +19,7 @@
// along with this program; if not, write to the Free Software // along with this program; if not, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
// //
// Translators: Admin (1065), jeromerobert (50), lonnnew (9), Oudiceval (474) // Translators: Admin (1068), jeromerobert (50), lonnnew (9), Oudiceval (474)
$text = array( $text = array(
'2_factor_auth' => 'Authentification forte', '2_factor_auth' => 'Authentification forte',
@ -1559,12 +1559,12 @@ Nom : [username]
'toggle_manager' => 'Basculer \'Responsable\'', 'toggle_manager' => 'Basculer \'Responsable\'',
'toggle_qrcode' => 'Afficher/masquer le QR code', 'toggle_qrcode' => 'Afficher/masquer le QR code',
'to_before_from' => 'La date de fin ne peut pas être avant la date de début.', 'to_before_from' => 'La date de fin ne peut pas être avant la date de début.',
'transfer_document' => '', 'transfer_document' => 'Transférer le document',
'transfer_no_read_access' => '', 'transfer_no_read_access' => '',
'transfer_no_write_access' => '', 'transfer_no_write_access' => 'L\'utilisateur n\'a pas accès à ce répertoire',
'transfer_objects' => 'Transférer des objets', 'transfer_objects' => 'Transférer des objets',
'transfer_objects_to_user' => 'Nouveau propriétaire', 'transfer_objects_to_user' => 'Nouveau propriétaire',
'transfer_to_user' => '', 'transfer_to_user' => 'Transférer vers un utilisateur',
'transition_triggered_email' => 'Transition de workflow activé', 'transition_triggered_email' => 'Transition de workflow activé',
'transition_triggered_email_body' => 'Transition de workflow déclenchée 'transition_triggered_email_body' => 'Transition de workflow déclenchée
Document : [name] Document : [name]

42
out/out.ErrorDlg.php Normal file
View File

@ -0,0 +1,42 @@
<?php
// MyDMS. Document Management System
// Copyright (C) 2002-2005 Markus Westphal
// Copyright (C) 2006-2008 Malcolm Cowe
// Copyright (C) 2010 Matteo Lucarelli
// Copyright (C) 2010-2016 Uwe Steinmann
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
// This file is needed because SeedDMS_View_Bootstrap::htmlEndPage() includes
// a file out/out.ErrorDlg.php?action=webrootjs and out/out.ErrorDlg.php?action=footerjs
include("../inc/inc.Settings.php");
include("../inc/inc.LogInit.php");
include("../inc/inc.Utils.php");
include("../inc/inc.Language.php");
include("../inc/inc.Init.php");
include("../inc/inc.Extension.php");
include("../inc/inc.DBInit.php");
include("../inc/inc.ClassUI.php");
include("../inc/inc.ClassAccessOperation.php");
include("../inc/inc.Authentication.php");
$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
if($view) {
$view($_GET);
exit;
}