Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
dioslaska committed Dec 17, 2015
2 parents 6644cd6 + a69dc07 commit e4038e7
Show file tree
Hide file tree
Showing 32 changed files with 266 additions and 81 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "mobiscroll",
"version": "2.17.0",
"version": "2.17.1",
"main": [
"js/mobiscroll.core.js",
"js/mobiscroll.frame.js",
Expand Down
2 changes: 1 addition & 1 deletion css/mobiscroll.frame.css
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@
}
/* Widget content styling */

.mbsc-wdg .dwcc {
.mbsc-wdg .mbsc-wdg-c {
position: relative;
z-index: 0;
padding: 1em;
Expand Down
2 changes: 2 additions & 0 deletions css/mobiscroll.mobiscroll-dark.css
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@
}
.mbsc-mobiscroll-dark .dw-cal-days {
color: #50ccc4;
}
.mbsc-mobiscroll-dark .dw-cal-days th {
border-color: #50ccc4;
}
.mbsc-mobiscroll-dark .dw-cal-btn-txt {
Expand Down
4 changes: 3 additions & 1 deletion css/mobiscroll.wp-light.css
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@
}
/* Progress */
.mbsc-wp-light.mbsc-progress .mbsc-label {
color: #878787;
color: #000000;
}
.mbsc-wp-light.mbsc-progress .mbsc-input-ic {
color: #000000;
Expand Down Expand Up @@ -234,6 +234,8 @@
.mbsc-wp-light .mbsc-input textarea:disabled,
.mbsc-wp-light .mbsc-input input:disabled {
background-color: transparent;
color: #4f4f4f;
border-color: #4f4f4f;
}
/* Checkbox */
.mbsc-wp-light .mbsc-checkbox-box {
Expand Down
57 changes: 57 additions & 0 deletions js/i18n/mobiscroll.i18n.ca.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
(function ($) {
$.mobiscroll.i18n.ca = {
// Core
setText: 'Acceptar',
cancelText: 'Cancel·lar',
clearText: 'Esborrar',
selectedText: '{count} seleccionat',
selectedPluralText: '{count} seleccionats',
// Datetime component
dateFormat: 'dd/mm/yy',
dateOrder: 'ddmmyy',
dayNames: ['Diumenge', 'Dilluns', 'Dimarts', 'Dimecres', 'Dijous', 'Divendres', 'Dissabte'],
dayNamesShort: ['Dg', 'Dl', 'Dt', 'Dc', 'Dj', 'Dv', 'Ds'],
dayNamesMin: ['Dg', 'Dl', 'Dt', 'Dc', 'Dj', 'Dv', 'Ds'],
dayText: 'Dia',
hourText: 'Hores',
minuteText: 'Minuts',
monthNames: ['Gener', 'Febrer', 'Març', 'Abril', 'Maig', 'Juny', 'Juliol', 'Agost', 'Setembre', 'Octubre', 'Novembre', 'Desembre'],
monthNamesShort: ['Gen', 'Feb', 'Mar', 'Abr', 'Mai', 'Jun', 'Jul', 'Ago', 'Set', 'Oct', 'Nov', 'Des'],
monthText: 'Mes',
secText: 'Segons',
timeFormat: 'HH:ii',
timeWheels: 'HHii',
yearText: 'Any',
nowText: 'Ara',
pmText: 'pm',
amText: 'am',
// Calendar component
firstDay: 1,
dateText: 'Data',
timeText: 'Temps',
calendarText: 'Calendari',
closeText: 'Tancar',
// Daterange component
fromText: 'Iniciar',
toText: 'Final',
// Measurement components
wholeText: 'Sencer',
fractionText: 'Fracció',
unitText: 'Unitat',
// Time / Timespan component
labels: ['Anys', 'Mesos', 'Dies', 'Hores', 'Minuts', 'Segons', ''],
labelsShort: ['Anys', 'Mesos', 'Dies', 'Hrs', 'Mins', 'Secs', ''],
// Timer component
startText: 'Iniciar',
stopText: 'Aturar',
resetText: 'Reiniciar',
lapText: 'Volta',
hideText: 'Amagar',
// Listview
backText: 'Tornar',
undoText: 'Desfer',
// Form
offText: 'No',
onText: 'Si'
};
})(jQuery);
5 changes: 4 additions & 1 deletion js/i18n/mobiscroll.i18n.cs.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@
undoText: 'Rozlepit',
// Form
offText: 'O',
onText: 'I'
onText: 'I',
// Numpad
decimalSeparator: ',',
thousandsSeparator: ' '
};
})(jQuery);
7 changes: 5 additions & 2 deletions js/i18n/mobiscroll.i18n.de.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
unitText: 'Maßeinheit',
// Time / Timespan component
labels: ['Jahre', 'Monate', 'Tage', 'Stunden', 'Minuten', 'Sekunden', ''],
labelsShort: ['Yrs', 'Mths', 'Days', 'Hrs', 'Mins', 'Secs', ''],
labelsShort: ['Jahr.', 'Mon.', 'Tag.', 'Std.', 'Min.', 'Sek.', ''],
// Timer component
startText: 'Starten',
stopText: 'Stoppen',
Expand All @@ -52,6 +52,9 @@
undoText: 'Rückgängig machen',
// Form
offText: 'Aus',
onText: 'Ein'
onText: 'Ein',
// Numpad
decimalSeparator: ',',
thousandsSeparator: ' '
};
})(jQuery);
12 changes: 8 additions & 4 deletions js/i18n/mobiscroll.i18n.es.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// Core
setText: 'Aceptar',
cancelText: 'Cancelar',
clearText: 'Claro',
clearText: 'Borrar',
selectedText: '{count} seleccionado',
selectedPluralText: '{count} seleccionados',
// Datetime component
Expand All @@ -26,6 +26,7 @@
pmText: 'pm',
amText: 'am',
// Calendar component
firstDay: 1,
dateText: 'Fecha',
timeText: 'Tiempo',
calendarText: 'Calendario',
Expand All @@ -39,18 +40,21 @@
unitText: 'Unidad',
// Time / Timespan component
labels: ['Años', 'Meses', 'Días', 'Horas', 'Minutos', 'Segundos', ''],
labelsShort: ['Yrs', 'Mths', 'Days', 'Hrs', 'Mins', 'Secs', ''],
labelsShort: ['Año', 'Mes', 'Día', 'Hora', 'Min', 'Seg', ''],
// Timer component
startText: 'Iniciar',
stopText: 'Deténgase',
resetText: 'Reinicializar',
lapText: 'Lap',
hideText: 'Esconder',
// Listview
backText: 'Espalda',
backText: 'Volver',
undoText: 'Deshacer',
// Form
offText: 'No',
onText: 'Sí'
onText: 'Sí',
// Numpad
decimalSeparator: ',',
thousandsSeparator: ' '
};
})(jQuery);
7 changes: 5 additions & 2 deletions js/i18n/mobiscroll.i18n.fr.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
unitText: 'Unité',
// Time / Timespan component
labels: ['Ans', 'Mois', 'Jours', 'Heures', 'Minutes', 'Secondes', ''],
labelsShort: ['Yrs', 'Mths', 'Days', 'Hrs', 'Mins', 'Secs', ''],
labelsShort: ['Ans', 'Mois', 'Jours', 'Hrs', 'Min', 'Sec', ''],
// Timer component
startText: 'Démarrer',
stopText: 'Arrêter',
Expand All @@ -52,6 +52,9 @@
undoText: 'Défaire',
// Form
offText: 'Non',
onText: 'Oui'
onText: 'Oui',
// Numpad
decimalSeparator: ',',
thousandsSeparator: ' '
};
})(jQuery);
5 changes: 4 additions & 1 deletion js/i18n/mobiscroll.i18n.hu.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,9 @@
undoText: 'Visszavon',
// Form
offText: 'Ki',
onText: 'Be'
onText: 'Be',
// Numpad
decimalSeparator: ',',
thousandsSeparator: ' '
};
})(jQuery);
7 changes: 5 additions & 2 deletions js/i18n/mobiscroll.i18n.it.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
unitText: 'Unità',
// Time / Timespan component
labels: ['Anni', 'Mesi', 'Giorni', 'Ore', 'Minuti', 'Secondi', ''],
labelsShort: ['Yrs', 'Mths', 'Days', 'Hrs', 'Mins', 'Secs', ''],
labelsShort: ['Anni', 'Mesi', 'Gio', 'Ore', 'Min', 'Sec', ''],
// Timer component
startText: 'Inizio',
stopText: 'Arresto',
Expand All @@ -52,6 +52,9 @@
undoText: 'Annulla',
// Form
offText: 'Via',
onText: 'Su'
onText: 'Su',
// Numpad
decimalSeparator: ',',
thousandsSeparator: ' '
};
})(jQuery);
5 changes: 4 additions & 1 deletion js/i18n/mobiscroll.i18n.lt.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@
undoText: 'Atšaukti veiksmą',
// Form
offText: 'Išj.',
onText: 'Įj.'
onText: 'Įj.',
// Numpad
decimalSeparator: ',',
thousandsSeparator: ' '
};
})(jQuery);
5 changes: 4 additions & 1 deletion js/i18n/mobiscroll.i18n.nl.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@
undoText: 'Onged. maken',
// Form
offText: 'Uit',
onText: 'Aan'
onText: 'Aan',
// Numpad
decimalSeparator: ',',
thousandsSeparator: ' '
};
})(jQuery);
7 changes: 5 additions & 2 deletions js/i18n/mobiscroll.i18n.no.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
unitText: 'Enhet',
// Time / Timespan component
labels: ['År', 'Måneder', 'Dager', 'Timer', 'Minutter', 'Sekunder', ''],
labelsShort: ['Yrs', 'Mths', 'Days', 'Hrs', 'Mins', 'Secs', ''],
labelsShort: ['År', 'Mån', 'Dag', 'Time', 'Min', 'Sek', ''],
// Timer component
startText: 'Start',
stopText: 'Stopp',
Expand All @@ -52,6 +52,9 @@
undoText: 'Angre',
// Form
offText: 'Av',
onText: 'På'
onText: 'På',
// Numpad
decimalSeparator: ',',
thousandsSeparator: ' '
};
})(jQuery);
5 changes: 4 additions & 1 deletion js/i18n/mobiscroll.i18n.pl.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@
undoText: 'Cofnij',
// Form
offText: 'Wył',
onText: 'Wł'
onText: 'Wł',
// Numpad
decimalSeparator: ',',
thousandsSeparator: ' '
};
})(jQuery);
7 changes: 5 additions & 2 deletions js/i18n/mobiscroll.i18n.pt-BR.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
unitText: 'Unidade',
// Time / Timespan component
labels: ['Anos', 'Meses', 'Dias', 'Horas', 'Minutos', 'Segundos', ''],
labelsShort: ['Yrs', 'Mths', 'Days', 'Hrs', 'Mins', 'Secs', ''],
labelsShort: ['Ano', 'Mês', 'Dia', 'Hora', 'Min', 'Seg', ''],
// Timer component
startText: 'Começar',
stopText: 'Pare',
Expand All @@ -54,6 +54,9 @@
undoText: 'Desfazer',
// Form
offText: 'Desl',
onText: 'Lig'
onText: 'Lig',
// Numpad
decimalSeparator: ',',
thousandsSeparator: ' '
};
})(jQuery);
5 changes: 4 additions & 1 deletion js/i18n/mobiscroll.i18n.pt-PT.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,9 @@
undoText: 'Anular',
// Form
offText: 'Desl',
onText: 'Lig'
onText: 'Lig',
// Numpad
decimalSeparator: ',',
thousandsSeparator: ' '
};
})(jQuery);
5 changes: 4 additions & 1 deletion js/i18n/mobiscroll.i18n.ro.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@
undoText: 'Anulaţi',
// Form
offText: 'Nu',
onText: 'Da'
onText: 'Da',
// Numpad
decimalSeparator: ',',
thousandsSeparator: ' '
};
})(jQuery);
5 changes: 4 additions & 1 deletion js/i18n/mobiscroll.i18n.ru-UA.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,9 @@
undoText: 'аннулировать',
// Form
offText: 'O',
onText: 'I'
onText: 'I',
// Numpad
decimalSeparator: ',',
thousandsSeparator: ' '
};
})(jQuery);
5 changes: 4 additions & 1 deletion js/i18n/mobiscroll.i18n.ru.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,9 @@
undoText: 'аннулировать',
// Form
offText: 'O',
onText: 'I'
onText: 'I',
// Numpad
decimalSeparator: ',',
thousandsSeparator: ' '
};
})(jQuery);
5 changes: 4 additions & 1 deletion js/i18n/mobiscroll.i18n.sk.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@
undoText: 'Späť',
// Form
offText: 'O',
onText: 'I'
onText: 'I',
// Numpad
decimalSeparator: ',',
thousandsSeparator: ' '
};
})(jQuery);
5 changes: 4 additions & 1 deletion js/i18n/mobiscroll.i18n.tr.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,9 @@
undoText: 'Geri Al',
// Form
offText: 'O',
onText: 'I'
onText: 'I',
// Numpad
decimalSeparator: ',',
thousandsSeparator: '.'
};
})(jQuery);
5 changes: 4 additions & 1 deletion js/i18n/mobiscroll.i18n.zh.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@
undoText: '复原',
// Form
offText: '关闭',
onText: '开启'
onText: '开启',
// Numpad
decimalSeparator: ',',
thousandsSeparator: ' '
};
})(jQuery);
Loading

0 comments on commit e4038e7

Please sign in to comment.