holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add some translations and adopt link list widget to take editor opener handler preference into account

Browse Source
This commit is contained in:
Hadi Nategh 2018-02-07 15:18:43 +01:00
parent 034b17a49a
commit 3bbad14683
4 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/js/etemplate/et2_widget_link.js
View File

@ -1913,10 +1913,10 @@ var et2_link_list = (function(){ "use strict"; return et2_link_string.extend(
if (_link_data && (typeof _link_data.download_url != 'undefined' || _link_data.app !='egw-data'))
{
$td.click( function(){
var fe_mime = egw.link_get_registry('filemanager-editor','mime');
var fe_mime = egw_get_file_editor_prefered_mimes();
// Check if the link entry is mime with media type, in order to open it in expose view
if (typeof _link_data.type != 'undefined' &&
(_link_data.type.match(self.mime_regexp,'ig') || (fe_mime && fe_mime[_link_data.type])))
(_link_data.type.match(self.mime_regexp,'ig') || (fe_mime && fe_mime.mime[_link_data.type])))
{
var $vfs_img_node = jQuery(this).parent().find('.vfsMimeIcon');
if ($vfs_img_node.length > 0) $vfs_img_node.click();

5
collabeditor/lang/egw_en.lang Normal file
View File

@ -0,0 +1,5 @@
are you sure that you want to discard all modifications applied to this document by you and other participants? collabeditor en Are you sure that you want to discard all modifications applied to this document by you and other participants?
delete file %1? collabeditor en Delete file %1?
document %1 has been saved successfully. collabeditor en Document %1 has been saved successfully.
this session is not valid anymore! save as your local changes if you need them or reload to join new session. collabeditor en This session is not valid anymore! Save as your local changes if you need them or reload to join new session.
you are the last one on this session. what would you like to do with all unsaved changes in this document? collabeditor en You are the last one on this session. What would you like to do with all unsaved changes in this document?

2
filemanager/inc/class.filemanager_hooks.inc.php
View File

@ -264,7 +264,7 @@ class filemanager_hooks
'merge_open_handler' => array(
'type' => 'select',
'label' => lang('Merge print open handler'),
'help' => lang('Defines how to open a merge print documents'),
'help' => lang('Defines how to open a merge print document'),
'name' => 'merge_open_handler',
'values' => array ('download' => lang('download'), 'collabora' => 'Collabora'),
'default' => 'collabora',

4
filemanager/lang/egw_en.lang
View File

@ -82,6 +82,7 @@ cut filemanager en Cut
cut to clipboard filemanager en Cut to clipboard
default behavior is no. the link will not be shown, but you are still able to navigate to this location, or configure this paricular location as startfolder or folderlink. filemanager en Default = No. The link will not be shown, but you are still able to navigate to this location, or configure this particular location as start folder or folder link.
default document to insert entries filemanager en Default document to insert entries
defines how to open a merge print document filemanager en Defines how to open a merge print document
delete all older versions and deleted files older then %s days filemanager en Delete all older versions and deleted files older than %s days
delete these files or directories? filemanager en Delete these files or directories?
delete these shares? filemanager en Delete these shares?
@ -123,6 +124,8 @@ example {{if n_prefix~mr~hello mr.~hello ms.}} - search the field "n_prefix", fo
example {{letterprefixcustom n_prefix title n_family}} - example: mr dr. james miller filemanager en Example {{LETTERPREFIXCUSTOM n_prefix title n_family}} - Example: Mr Dr. James Miller
example {{nelf role}} - if field role is not empty, you will get a new line with the value of field role filemanager en Example {{NELF role}} - if field role is not empty, you will get a new line with the value of field role
example {{nenvlf role}} - if field role is not empty, set a lf without any value of the field filemanager en Example {{nenvlf role}} - if field role is not empty, set a LF without any value of the field
excludes selected mime types filemanager en Excludes selected mime types
excludes selected mime types from being opened by editor filemanager en Excludes selected mime types from being opened by editor
executable filemanager en Executable
expires filemanager en Expires
export definition to use for nextmatch export filemanager en Export definition to use for nextmatch export
@ -181,6 +184,7 @@ log out as superuser filemanager en Log out as super user
mail files filemanager en Mail files
mail paste filemanager en Mail paste
max folderlinks admin en Max folder links
merge print open handler filemanager en Merge print open handler
mime type filemanager en Mime type
modified filemanager en Modified
modified between filemanager en Modified between