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

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

Browse Source
This commit is contained in:
Uwe Steinmann 2018-07-20 07:32:58 +02:00
commit 86f73947b0
10 changed files with 31 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG
View File

@ -241,6 +241,12 @@
- add .xml to online file types by default - add .xml to online file types by default
- add home folder for users - add home folder for users
--------------------------------------------------------------------------------
Changes in version 4.3.38
--------------------------------------------------------------------------------
- translation updates
- pass email instead of fullname to restapi /account/email
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
Changes in version 4.3.37 Changes in version 4.3.37
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------

4
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 (2629), dgrutsch (22) // Translators: Admin (2630), dgrutsch (22)
$text = array( $text = array(
'2_factor_auth' => '2-Faktor Authentifizierung', '2_factor_auth' => '2-Faktor Authentifizierung',
@ -1663,7 +1663,7 @@ Name: [username]
'submit_password' => 'Setze neues Passwort', 'submit_password' => 'Setze neues Passwort',
'submit_password_forgotten' => 'Neues Passwort setzen und per E-Mail schicken', 'submit_password_forgotten' => 'Neues Passwort setzen und per E-Mail schicken',
'submit_receipt' => 'Empfang bestätigen', 'submit_receipt' => 'Empfang bestätigen',
'submit_review' => 'Wiederholungsprüfung hinzufügen', 'submit_review' => 'Prüfung hinzufügen',
'submit_revision' => 'Wiederholungsprüfung hinzufügen', 'submit_revision' => 'Wiederholungsprüfung hinzufügen',
'submit_userinfo' => 'Daten setzen', 'submit_userinfo' => 'Daten setzen',
'subsribe_timelinefeed' => 'Verauf als RSS-Feed abonnieren', 'subsribe_timelinefeed' => 'Verauf als RSS-Feed abonnieren',

6
languages/el_GR/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 (272) // Translators: Admin (274)
$text = array( $text = array(
'2_factor_auth' => '', '2_factor_auth' => '',
@ -34,7 +34,7 @@ $text = array(
'access_mode_all' => 'Πλήρης πρόσβαση', 'access_mode_all' => 'Πλήρης πρόσβαση',
'access_mode_none' => '', 'access_mode_none' => '',
'access_mode_read' => 'Δικαιώματα ανάγνωσης', 'access_mode_read' => 'Δικαιώματα ανάγνωσης',
'access_mode_readwrite' => '', 'access_mode_readwrite' => 'Δικαιώματα ανάγνωσης-εγγραφής',
'access_permission_changed_email' => '', 'access_permission_changed_email' => '',
'access_permission_changed_email_body' => '', 'access_permission_changed_email_body' => '',
'access_permission_changed_email_subject' => '', 'access_permission_changed_email_subject' => '',
@ -413,7 +413,7 @@ $text = array(
'email_header' => '', 'email_header' => '',
'email_not_given' => '', 'email_not_given' => '',
'empty_attribute_group_list' => '', 'empty_attribute_group_list' => '',
'empty_folder_list' => '', 'empty_folder_list' => 'Δεν υπάρχουν αρχεία ή φάκελοι',
'empty_list' => '', 'empty_list' => '',
'empty_notify_list' => '', 'empty_notify_list' => '',
'en_GB' => 'English (GB)/Αγγλικά', 'en_GB' => 'English (GB)/Αγγλικά',

4
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 (1745), archonwang (3), dgrutsch (9), netixw (14) // Translators: Admin (1746), archonwang (3), dgrutsch (9), netixw (14)
$text = array( $text = array(
'2_factor_auth' => '2-factor authentication', '2_factor_auth' => '2-factor authentication',
@ -625,7 +625,7 @@ URL: [url]',
'group_info' => 'Group information', 'group_info' => 'Group information',
'group_management' => 'Groups management', 'group_management' => 'Groups management',
'group_members' => 'Group members', 'group_members' => 'Group members',
'group_receipt_summary' => 'Group receipt confirmations overview.', 'group_receipt_summary' => 'Group receipt summary',
'group_review_summary' => 'Group review summary', 'group_review_summary' => 'Group review summary',
'guest_login' => 'Login as guest', 'guest_login' => 'Login as guest',
'guest_login_disabled' => 'Guest login is disabled.', 'guest_login_disabled' => 'Guest login is disabled.',

2
languages/hu_HU/lang.inc
View File

@ -24,7 +24,7 @@
$text = array( $text = array(
'2_factor_auth' => 'Kétfaktoros azonosítás', '2_factor_auth' => 'Kétfaktoros azonosítás',
'2_factor_auth_info' => '', '2_factor_auth_info' => '',
'2_fact_auth_secret' => '', '2_fact_auth_secret' => 'Titkos',
'accept' => 'Elfogad', 'accept' => 'Elfogad',
'access_control' => '', 'access_control' => '',
'access_control_is_off' => '', 'access_control_is_off' => '',

6
languages/it_IT/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 (1617), rickr (144), s.pnt (26) // Translators: Admin (1619), rickr (144), s.pnt (26)
$text = array( $text = array(
'2_factor_auth' => 'Autorizzazione a due fattori', '2_factor_auth' => 'Autorizzazione a due fattori',
@ -1135,7 +1135,7 @@ URL: [url]',
'select_attrdefgrp_show' => 'Scegli quando mostrare', 'select_attrdefgrp_show' => 'Scegli quando mostrare',
'select_attribute_value' => '', 'select_attribute_value' => '',
'select_category' => 'Clicca per selezionare la categoria', 'select_category' => 'Clicca per selezionare la categoria',
'select_group' => '', 'select_group' => 'Seleziona Gruppo',
'select_groups' => 'Clicca per selezionare i gruppi', 'select_groups' => 'Clicca per selezionare i gruppi',
'select_grp_approvers' => 'Seleziona gruppo approvatore', 'select_grp_approvers' => 'Seleziona gruppo approvatore',
'select_grp_ind_approvers' => 'Fare clic per scegliere il gruppo', 'select_grp_ind_approvers' => 'Fare clic per scegliere il gruppo',
@ -1153,7 +1153,7 @@ URL: [url]',
'select_ind_reviewers' => 'Seleziona revisore', 'select_ind_reviewers' => 'Seleziona revisore',
'select_ind_revisors' => 'Seleziona singoli revisori', 'select_ind_revisors' => 'Seleziona singoli revisori',
'select_one' => 'Seleziona uno', 'select_one' => 'Seleziona uno',
'select_user' => '', 'select_user' => 'Seleziona Utente',
'select_users' => 'Clicca per selezionare gli utenti', 'select_users' => 'Clicca per selezionare gli utenti',
'select_value' => 'Selezionare un valore', 'select_value' => 'Selezionare un valore',
'select_workflow' => 'Seleziona il flusso di lavoro', 'select_workflow' => 'Seleziona il flusso di lavoro',

4
languages/nl_NL/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 (756), gijsbertush (610), pepijn (45), reinoutdijkstra@hotmail.com (270) // Translators: Admin (757), gijsbertush (610), pepijn (45), reinoutdijkstra@hotmail.com (270)
$text = array( $text = array(
'2_factor_auth' => '2-factor-authenticatie', '2_factor_auth' => '2-factor-authenticatie',
@ -726,7 +726,7 @@ URL: [url]',
'login_ok' => 'Login geslaagd', 'login_ok' => 'Login geslaagd',
'logout' => 'Log uit', 'logout' => 'Log uit',
'log_management' => 'Logbestanden beheer', 'log_management' => 'Logbestanden beheer',
'lo_LA' => '', 'lo_LA' => 'Laotiaans',
'manager' => 'Beheerder', 'manager' => 'Beheerder',
'manager_of_group' => 'U bent beheerder van deze groep', 'manager_of_group' => 'U bent beheerder van deze groep',
'mandatory_approvergroups' => 'Verplichte groep \'[group]\'', 'mandatory_approvergroups' => 'Verplichte groep \'[group]\'',

6
languages/pl_PL/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 (802), netixw (84), romi (93), uGn (112) // Translators: Admin (804), netixw (84), romi (93), uGn (112)
$text = array( $text = array(
'2_factor_auth' => '', '2_factor_auth' => '',
@ -1081,7 +1081,7 @@ URL: [url]',
'select_attrdefgrp_show' => '', 'select_attrdefgrp_show' => '',
'select_attribute_value' => '', 'select_attribute_value' => '',
'select_category' => 'Kliknij by wybrać kategorię', 'select_category' => 'Kliknij by wybrać kategorię',
'select_group' => '', 'select_group' => 'Wybierz grupę',
'select_groups' => 'Kliknij by wybrać grupy', 'select_groups' => 'Kliknij by wybrać grupy',
'select_grp_approvers' => 'Kliknij by wybrać grupę zatwierdzającą', 'select_grp_approvers' => 'Kliknij by wybrać grupę zatwierdzającą',
'select_grp_ind_approvers' => '', 'select_grp_ind_approvers' => '',
@ -1099,7 +1099,7 @@ URL: [url]',
'select_ind_reviewers' => 'Kliknij by wybrać recenzenta', 'select_ind_reviewers' => 'Kliknij by wybrać recenzenta',
'select_ind_revisors' => '', 'select_ind_revisors' => '',
'select_one' => 'Wybierz', 'select_one' => 'Wybierz',
'select_user' => '', 'select_user' => 'Wybierz użytkownika',
'select_users' => 'Kliknij by wybrać użytkowników', 'select_users' => 'Kliknij by wybrać użytkowników',
'select_value' => 'Wybrać wartość', 'select_value' => 'Wybrać wartość',
'select_workflow' => 'Wybierz proces', 'select_workflow' => 'Wybierz proces',

16
languages/zh_TW/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 (2408) // Translators: Admin (2415)
$text = array( $text = array(
'2_factor_auth' => '', '2_factor_auth' => '',
@ -993,7 +993,7 @@ URL: [url]',
'settings_activate_php_extension' => '', 'settings_activate_php_extension' => '',
'settings_adminIP' => '', 'settings_adminIP' => '',
'settings_adminIP_desc' => '', 'settings_adminIP_desc' => '',
'settings_Advanced' => '', 'settings_Advanced' => '進階',
'settings_advancedAcl' => '', 'settings_advancedAcl' => '',
'settings_advancedAcl_desc' => '', 'settings_advancedAcl_desc' => '',
'settings_allowReviewerOnly' => '', 'settings_allowReviewerOnly' => '',
@ -1057,7 +1057,7 @@ URL: [url]',
'settings_disableSelfEdit' => '', 'settings_disableSelfEdit' => '',
'settings_disableSelfEdit_desc' => '', 'settings_disableSelfEdit_desc' => '',
'settings_disable_install' => '', 'settings_disable_install' => '',
'settings_Display' => '', 'settings_Display' => '顯示設定',
'settings_dropFolderDir' => '', 'settings_dropFolderDir' => '',
'settings_dropFolderDir_desc' => '', 'settings_dropFolderDir_desc' => '',
'settings_Edition' => '', 'settings_Edition' => '',
@ -1155,12 +1155,12 @@ URL: [url]',
'settings_expandFolderTree_val0' => '', 'settings_expandFolderTree_val0' => '',
'settings_expandFolderTree_val1' => '', 'settings_expandFolderTree_val1' => '',
'settings_expandFolderTree_val2' => '', 'settings_expandFolderTree_val2' => '',
'settings_Extensions' => '', 'settings_Extensions' => '延伸功能',
'settings_extraPath' => '額外的PHP的include路徑', 'settings_extraPath' => '額外的PHP的include路徑',
'settings_extraPath_desc' => '附加軟體的路徑。這是包含目錄，例如在ADODB目錄或額外的PEAR包', 'settings_extraPath_desc' => '附加軟體的路徑。這是包含目錄，例如在ADODB目錄或額外的PEAR包',
'settings_firstDayOfWeek' => '', 'settings_firstDayOfWeek' => '',
'settings_firstDayOfWeek_desc' => '', 'settings_firstDayOfWeek_desc' => '',
'settings_footNote' => '', 'settings_footNote' => '頁尾註解',
'settings_footNote_desc' => '', 'settings_footNote_desc' => '',
'settings_fullSearchEngine' => '', 'settings_fullSearchEngine' => '',
'settings_fullSearchEngine_desc' => '', 'settings_fullSearchEngine_desc' => '',
@ -1268,10 +1268,10 @@ URL: [url]',
'settings_showMissingTranslations_desc' => '', 'settings_showMissingTranslations_desc' => '',
'settings_showSingleSearchHit' => '', 'settings_showSingleSearchHit' => '',
'settings_showSingleSearchHit_desc' => '', 'settings_showSingleSearchHit_desc' => '',
'settings_Site' => '', 'settings_Site' => '站台',
'settings_siteDefaultPage' => '網站的默認頁', 'settings_siteDefaultPage' => '網站的默認頁',
'settings_siteDefaultPage_desc' => '', 'settings_siteDefaultPage_desc' => '',
'settings_siteName' => '', 'settings_siteName' => '站台名稱',
'settings_siteName_desc' => '', 'settings_siteName_desc' => '',
'settings_SMTP' => 'SMTP 伺服器設定', 'settings_SMTP' => 'SMTP 伺服器設定',
'settings_smtpPassword' => '', 'settings_smtpPassword' => '',
@ -1303,7 +1303,7 @@ URL: [url]',
'settings_strictFormCheck' => '', 'settings_strictFormCheck' => '',
'settings_strictFormCheck_desc' => '', 'settings_strictFormCheck_desc' => '',
'settings_suggestionvalue' => '', 'settings_suggestionvalue' => '',
'settings_System' => '', 'settings_System' => '系統',
'settings_tasksInMenu' => '', 'settings_tasksInMenu' => '',
'settings_tasksInMenu_approval' => '', 'settings_tasksInMenu_approval' => '',
'settings_tasksInMenu_desc' => '', 'settings_tasksInMenu_desc' => '',

2
restapi/index.php
View File

@ -237,7 +237,7 @@ function setEmail($id) { /* {{{ */
return; return;
} }
$userobj->setEmail($app->request()->put('fullname')); $userobj->setEmail($app->request()->put('email'));
$app->response()->header('Content-Type', 'application/json'); $app->response()->header('Content-Type', 'application/json');
echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$userid)); echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$userid));
} /* }}} */ } /* }}} */