From a874535df4a7c68616729023d3d73f79faa280f3 Mon Sep 17 00:00:00 2001 From: nathangray Date: Wed, 30 May 2018 15:14:03 -0600 Subject: [PATCH] * Calendar - fix week header rendering problem in some languages Translation was too long, now allowing up to 3 letters but longer trimmed --- calendar/js/et2_widget_timegrid.js | 28 ++++++++++++++-------------- calendar/lang/egw_eu.lang | 2 +- calendar/lang/egw_fr.lang | 2 +- calendar/lang/egw_it.lang | 2 +- calendar/lang/egw_pl.lang | 2 +- calendar/lang/egw_pt.lang | 2 +- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/calendar/js/et2_widget_timegrid.js b/calendar/js/et2_widget_timegrid.js index 10b3506879..c754be7b15 100644 --- a/calendar/js/et2_widget_timegrid.js +++ b/calendar/js/et2_widget_timegrid.js @@ -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 - * + * * @param {jQuery.Event} event * @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('mouseup', jQuery.proxy(this._mouse_up, this)); - + return true; }, @@ -1137,10 +1137,10 @@ var et2_calendar_timegrid = (function(){ "use strict"; return et2_calendar_view. }, this, et2_calendar_daycol); } } - var enabled = !owner_match && + var enabled = !owner_match && // Not inside its own timegrid !own_timegrid; - + widget_object.getActionLink('invite').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) { if (this.options.readonly) return; - + var self = this; 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.hideOnDisabled = true; - + // Create the drop action for moving events between calendars 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('
'); } - + var event_data = egw.dataGetUIDdata(source[i].id).data; et2_calendar_event.recur_prompt(event_data, function(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', [ button_id==='series' ? event_data.id : event_data.app_id, add_owner, - action.id === 'change_participant' ? + action.id === 'change_participant' ? 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 this.div.toggleClass( 'calendar_TimeGridNoLabel', - label.trim().length > 0 && label.trim().length < 6 || + label.trim().length > 0 && label.trim().length <= 6 || this.options.owner.length > 1 ); }, @@ -1792,7 +1792,7 @@ var et2_calendar_timegrid = (function(){ "use strict"; return et2_calendar_view. { var result = true; if(this.options.readonly ) return; - + // Drag to create in progress 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 - * + * * @param {jQuery.Event} 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 (this.options.readonly) return; - + var start = jQuery.extend({},this.gridHover[0].dataset); if(start.date) { @@ -2148,7 +2148,7 @@ var et2_calendar_timegrid = (function(){ "use strict"; return et2_calendar_view. // Allow for toolbar height -= jQuery('#calendar-toolbar',this.div.parents('.egw_fw_ui_tab_content')).outerHeight(true); } - + this.options.height = Math.floor(height / rowCount); // 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; // Space for todos, if there 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; // update day widgets for(var i = 0; i < this.day_widgets.length; i++) diff --git a/calendar/lang/egw_eu.lang b/calendar/lang/egw_eu.lang index 62665f6a05..15e4ca4fe1 100644 --- a/calendar/lang/egw_eu.lang +++ b/calendar/lang/egw_eu.lang @@ -306,7 +306,7 @@ weekview calendar eu Astearen ikuspegia weekview with weekend calendar eu Asteko ikuspegia asteburuarekin weekview without weekend calendar eu Asteko ikuspegia astebukaerarik gabe 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 starts on calendar eu Lan egunak hasten dira yearly calendar eu Urtero diff --git a/calendar/lang/egw_fr.lang b/calendar/lang/egw_fr.lang index 4af71c458e..3d4176241d 100644 --- a/calendar/lang/egw_fr.lang +++ b/calendar/lang/egw_fr.lang @@ -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. whole day calendar fr Journée entière 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 starts on calendar fr La journée de travail démarre à workday calendar fr Jour ouvré diff --git a/calendar/lang/egw_it.lang b/calendar/lang/egw_it.lang index 6f53a1b606..cad3873efb 100644 --- a/calendar/lang/egw_it.lang +++ b/calendar/lang/egw_it.lang @@ -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 whole day calendar it Giornata intera 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 starts on calendar it La giornata lavorativa inizia alle workday calendar it Giorno feriale diff --git a/calendar/lang/egw_pl.lang b/calendar/lang/egw_pl.lang index 7cb79c987c..b193d5da41 100755 --- a/calendar/lang/egw_pl.lang +++ b/calendar/lang/egw_pl.lang @@ -452,7 +452,7 @@ weekview calendar pl Widok tygodniowy weekview with weekend calendar pl Widok tygodniowy z weekendem weekview without weekend calendar pl Widok tygodniowy bez weekendu 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 starts on calendar pl Początek dnia o workday calendar pl Dzień roboczy diff --git a/calendar/lang/egw_pt.lang b/calendar/lang/egw_pt.lang index c069af5ae7..1e07d929bd 100644 --- a/calendar/lang/egw_pt.lang +++ b/calendar/lang/egw_pt.lang @@ -341,7 +341,7 @@ weekview calendar pt Visualização semanal weekview with weekend calendar pt Visualização semanal com fim de semana weekview without weekend calendar pt Visualização semanal sem fim de semana 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 starts on calendar pt Dia de trabalho começa às yearly calendar pt Anual