extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-25 16:19:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Calendar - fix week header rendering problem in some languages

Browse Source 
Translation was too long, now allowing up to 3 letters but longer trimmed
This commit is contained in:
nathangray 2018-05-30 15:14:03 -06:00
parent daa4670f60
commit a874535df4
6 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
calendar/js/et2_widget_timegrid.js
View File

@ -232,7 +232,7 @@ var et2_calendar_timegrid = (function(){ "use strict"; return et2_calendar_view.
/** /**
* If dragging to resize an event, abort drag to create * If dragging to resize an event, abort drag to create
* *
* @param {jQuery.Event} event * @param {jQuery.Event} event
* @param {Object} ui * @param {Object} ui
*/ */
@ -337,7 +337,7 @@ var et2_calendar_timegrid = (function(){ "use strict"; return et2_calendar_view.
}) })
.on('mousedown', jQuery.proxy(this._mouse_down, this)) .on('mousedown', jQuery.proxy(this._mouse_down, this))
.on('mouseup', jQuery.proxy(this._mouse_up, this)); .on('mouseup', jQuery.proxy(this._mouse_up, this));
return true; return true;
}, },
@ -1137,10 +1137,10 @@ var et2_calendar_timegrid = (function(){ "use strict"; return et2_calendar_view.
}, this, et2_calendar_daycol); }, this, et2_calendar_daycol);
} }
} }
var enabled = !owner_match && var enabled = !owner_match &&
// Not inside its own timegrid // Not inside its own timegrid
!own_timegrid; !own_timegrid;
widget_object.getActionLink('invite').enabled = enabled; widget_object.getActionLink('invite').enabled = enabled;
widget_object.getActionLink('change_participant').enabled = enabled; widget_object.getActionLink('change_participant').enabled = enabled;
@ -1278,7 +1278,7 @@ var et2_calendar_timegrid = (function(){ "use strict"; return et2_calendar_view.
_init_links_dnd: function(mgr,actionLinks) { _init_links_dnd: function(mgr,actionLinks) {
if (this.options.readonly) return; if (this.options.readonly) return;
var self = this; var self = this;
var drop_link = mgr.getActionById('egw_link_drop'); var drop_link = mgr.getActionById('egw_link_drop');
@ -1381,7 +1381,7 @@ var et2_calendar_timegrid = (function(){ "use strict"; return et2_calendar_view.
drop_link.acceptedTypes = ['default','link']; drop_link.acceptedTypes = ['default','link'];
drop_link.hideOnDisabled = true; drop_link.hideOnDisabled = true;
// Create the drop action for moving events between calendars // Create the drop action for moving events between calendars
var invite_action = function(action, source, target) { var invite_action = function(action, source, target) {
@ -1415,7 +1415,7 @@ var et2_calendar_timegrid = (function(){ "use strict"; return et2_calendar_view.
{ {
jQuery('.calendar_timeDemo',loading).after('<div class="loading"></div>'); jQuery('.calendar_timeDemo',loading).after('<div class="loading"></div>');
} }
var event_data = egw.dataGetUIDdata(source[i].id).data; var event_data = egw.dataGetUIDdata(source[i].id).data;
et2_calendar_event.recur_prompt(event_data, function(button_id) { et2_calendar_event.recur_prompt(event_data, function(button_id) {
if(button_id === 'cancel' || !button_id) if(button_id === 'cancel' || !button_id)
@ -1435,7 +1435,7 @@ var et2_calendar_timegrid = (function(){ "use strict"; return et2_calendar_view.
egw().json('calendar.calendar_uiforms.ajax_invite', [ egw().json('calendar.calendar_uiforms.ajax_invite', [
button_id==='series' ? event_data.id : event_data.app_id, button_id==='series' ? event_data.id : event_data.app_id,
add_owner, add_owner,
action.id === 'change_participant' ? action.id === 'change_participant' ?
jQuery.extend([],source[i].iface.getWidget().getParent().options.owner) : jQuery.extend([],source[i].iface.getWidget().getParent().options.owner) :
[] []
], ],
@ -1658,7 +1658,7 @@ var et2_calendar_timegrid = (function(){ "use strict"; return et2_calendar_view.
// but is empty, but give extra space for a single owner name // but is empty, but give extra space for a single owner name
this.div.toggleClass( this.div.toggleClass(
'calendar_TimeGridNoLabel', 'calendar_TimeGridNoLabel',
label.trim().length > 0 && label.trim().length < 6 || label.trim().length > 0 && label.trim().length <= 6 ||
this.options.owner.length > 1 this.options.owner.length > 1
); );
}, },
@ -1792,7 +1792,7 @@ var et2_calendar_timegrid = (function(){ "use strict"; return et2_calendar_view.
{ {
var result = true; var result = true;
if(this.options.readonly ) return; if(this.options.readonly ) return;
// Drag to create in progress // Drag to create in progress
if(this.drag_create.start !== null) return; if(this.drag_create.start !== null) return;
@ -1878,7 +1878,7 @@ var et2_calendar_timegrid = (function(){ "use strict"; return et2_calendar_view.
/** /**
* Mousedown handler to support drag to create * Mousedown handler to support drag to create
* *
* @param {jQuery.Event} event * @param {jQuery.Event} event
*/ */
_mouse_down: function(event) _mouse_down: function(event)
@ -1886,7 +1886,7 @@ var et2_calendar_timegrid = (function(){ "use strict"; return et2_calendar_view.
if(event.which !== 1) return; if(event.which !== 1) return;
if (this.options.readonly) return; if (this.options.readonly) return;
var start = jQuery.extend({},this.gridHover[0].dataset); var start = jQuery.extend({},this.gridHover[0].dataset);
if(start.date) if(start.date)
{ {
@ -2148,7 +2148,7 @@ var et2_calendar_timegrid = (function(){ "use strict"; return et2_calendar_view.
// Allow for toolbar // Allow for toolbar
height -= jQuery('#calendar-toolbar',this.div.parents('.egw_fw_ui_tab_content')).outerHeight(true); height -= jQuery('#calendar-toolbar',this.div.parents('.egw_fw_ui_tab_content')).outerHeight(true);
} }
this.options.height = Math.floor(height / rowCount); this.options.height = Math.floor(height / rowCount);
// Allow for borders & padding // Allow for borders & padding
@ -2208,7 +2208,7 @@ var et2_calendar_timegrid = (function(){ "use strict"; return et2_calendar_view.
var total_width = modify_node.parent().innerWidth() - this.days.position().left; var total_width = modify_node.parent().innerWidth() - this.days.position().left;
// Space for todos, if there // Space for todos, if there
total_width -= jQuery(this.getInstanceManager().DOMContainer).siblings().has(':visible').not('#calendar-toolbar').outerWidth() total_width -= jQuery(this.getInstanceManager().DOMContainer).siblings().has(':visible').not('#calendar-toolbar').outerWidth()
var day_width = (total_width > 0 ? total_width : modify_node.width())/this.day_widgets.length; var day_width = (total_width > 0 ? total_width : modify_node.width())/this.day_widgets.length;
// update day widgets // update day widgets
for(var i = 0; i < this.day_widgets.length; i++) for(var i = 0; i < this.day_widgets.length; i++)

2
calendar/lang/egw_eu.lang
View File

@ -306,7 +306,7 @@ weekview calendar eu Astearen ikuspegia
weekview with weekend calendar eu Asteko ikuspegia asteburuarekin weekview with weekend calendar eu Asteko ikuspegia asteburuarekin
weekview without weekend calendar eu Asteko ikuspegia astebukaerarik gabe weekview without weekend calendar eu Asteko ikuspegia astebukaerarik gabe
whole day calendar eu egun osoa whole day calendar eu egun osoa
wk calendar eu Astea wk calendar eu Ast
work day ends on calendar eu Lan egunak bukatzen dira work day ends on calendar eu Lan egunak bukatzen dira
work day starts on calendar eu Lan egunak hasten dira work day starts on calendar eu Lan egunak hasten dira
yearly calendar eu Urtero yearly calendar eu Urtero

2
calendar/lang/egw_fr.lang
View File

@ -588,7 +588,7 @@ which view to show on home page calendar fr Quelle vue afficher dans l'accueil ?
while selecting up to x users day- and weekview is not consolidated (5 is used when not set) admin fr Nombre minimum d'utilisateur pour afficher la vue journalière et multi-semaine en consolidée. 5 par défaut. while selecting up to x users day- and weekview is not consolidated (5 is used when not set) admin fr Nombre minimum d'utilisateur pour afficher la vue journalière et multi-semaine en consolidée. 5 par défaut.
whole day calendar fr Journée entière whole day calendar fr Journée entière
with credentials included calendar fr Avec les droits inclus with credentials included calendar fr Avec les droits inclus
wk calendar fr Sem. wk calendar fr Sem
work day ends on calendar fr La journée de travail finit à work day ends on calendar fr La journée de travail finit à
work day starts on calendar fr La journée de travail démarre à work day starts on calendar fr La journée de travail démarre à
workday calendar fr Jour ouvré workday calendar fr Jour ouvré

2
calendar/lang/egw_it.lang
View File

@ -626,7 +626,7 @@ which view to show on home page calendar it Quale visualizzazione usare nella ho
while selecting up to x users day- and weekview is not consolidated (5 is used when not set) admin it Numero minimo di utenti per visualizzazioni giornaliera e settimanale come consolidate. Predefinito = 5 while selecting up to x users day- and weekview is not consolidated (5 is used when not set) admin it Numero minimo di utenti per visualizzazioni giornaliera e settimanale come consolidate. Predefinito = 5
whole day calendar it Giornata intera whole day calendar it Giornata intera
with credentials included calendar it Con credenziali incluse with credentials included calendar it Con credenziali incluse
wk calendar it Sett wk calendar it Stt
work day ends on calendar it La giornata lavorativa termina alle work day ends on calendar it La giornata lavorativa termina alle
work day starts on calendar it La giornata lavorativa inizia alle work day starts on calendar it La giornata lavorativa inizia alle
workday calendar it Giorno feriale workday calendar it Giorno feriale

2
calendar/lang/egw_pl.lang
View File

@ -452,7 +452,7 @@ weekview calendar pl Widok tygodniowy
weekview with weekend calendar pl Widok tygodniowy z weekendem weekview with weekend calendar pl Widok tygodniowy z weekendem
weekview without weekend calendar pl Widok tygodniowy bez weekendu weekview without weekend calendar pl Widok tygodniowy bez weekendu
whole day calendar pl cały dzień whole day calendar pl cały dzień
wk calendar pl Tydź. wk calendar pl Tdź
work day ends on calendar pl Koniec dnia o work day ends on calendar pl Koniec dnia o
work day starts on calendar pl Początek dnia o work day starts on calendar pl Początek dnia o
workday calendar pl Dzień roboczy workday calendar pl Dzień roboczy

2
calendar/lang/egw_pt.lang
View File

@ -341,7 +341,7 @@ weekview calendar pt Visualização semanal
weekview with weekend calendar pt Visualização semanal com fim de semana weekview with weekend calendar pt Visualização semanal com fim de semana
weekview without weekend calendar pt Visualização semanal sem fim de semana weekview without weekend calendar pt Visualização semanal sem fim de semana
whole day calendar pt dia inteiro whole day calendar pt dia inteiro
wk calendar pt Semana wk calendar pt Sem
work day ends on calendar pt Dia de trabalho termina às work day ends on calendar pt Dia de trabalho termina às
work day starts on calendar pt Dia de trabalho começa às work day starts on calendar pt Dia de trabalho começa às
yearly calendar pt Anual yearly calendar pt Anual