Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Stud.IP
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jakob Diel
Stud.IP
Commits
ec538271
Commit
ec538271
authored
Jan 26, 2023
by
Jan-Hendrik Willms
Committed by
Jan-Hendrik Willms
Feb 3, 2023
Browse files
Options
Downloads
Patches
Plain Diff
set locale for pickers after locale has been set, fixes #2085
Closes #2085 Merge request
studip/studip!1349
parent
d6b5e8b1
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
resources/assets/javascripts/studip-ui.js
+87
-84
87 additions, 84 deletions
resources/assets/javascripts/studip-ui.js
with
87 additions
and
84 deletions
resources/assets/javascripts/studip-ui.js
+
87
−
84
View file @
ec538271
import
{
$gettext
}
from
'
./lib/gettext.js
'
;
import
eventBus
from
"
./lib/event-bus
"
;
/*jslint browser: true */
/*global jQuery, STUDIP */
...
...
@@ -33,82 +34,6 @@ import { $gettext } from './lib/gettext.js';
return
;
}
// Setup defaults and default locales
var
defaults
=
{},
locale
=
{
closeText
:
$gettext
(
'
Schließen
'
),
prevText
:
$gettext
(
'
Zurück
'
),
nextText
:
$gettext
(
'
Vor
'
),
currentText
:
$gettext
(
'
Jetzt
'
),
monthNames
:
[
$gettext
(
'
Januar
'
),
$gettext
(
'
Februar
'
),
$gettext
(
'
März
'
),
$gettext
(
'
April
'
),
$gettext
(
'
Mai
'
),
$gettext
(
'
Juni
'
),
$gettext
(
'
Juli
'
),
$gettext
(
'
August
'
),
$gettext
(
'
September
'
),
$gettext
(
'
Oktober
'
),
$gettext
(
'
November
'
),
$gettext
(
'
Dezember
'
)
],
monthNamesShort
:
[
$gettext
(
'
Jan
'
),
$gettext
(
'
Feb
'
),
$gettext
(
'
Mär
'
),
$gettext
(
'
Apr
'
),
$gettext
(
'
Mai
'
),
$gettext
(
'
Jun
'
),
$gettext
(
'
Jul
'
),
$gettext
(
'
Aug
'
),
$gettext
(
'
Sep
'
),
$gettext
(
'
Okt
'
),
$gettext
(
'
Nov
'
),
$gettext
(
'
Dez
'
)
],
dayNames
:
[
$gettext
(
'
Sonntag
'
),
$gettext
(
'
Montag
'
),
$gettext
(
'
Dienstag
'
),
$gettext
(
'
Mittwoch
'
),
$gettext
(
'
Donnerstag
'
),
$gettext
(
'
Freitag
'
),
$gettext
(
'
Samstag
'
)
],
dayNamesShort
:
[
$gettext
(
'
So
'
),
$gettext
(
'
Mo
'
),
$gettext
(
'
Di
'
),
$gettext
(
'
Mi
'
),
$gettext
(
'
Do
'
),
$gettext
(
'
Fr
'
),
$gettext
(
'
Sa
'
)
],
weekHeader
:
$gettext
(
'
Wo
'
),
dateFormat
:
'
dd.mm.yy
'
,
firstDay
:
1
,
isRTL
:
false
,
showMonthAfterYear
:
false
,
yearSuffix
:
''
,
changeMonth
:
true
,
changeYear
:
true
,
timeOnlyTitle
:
$gettext
(
'
Zeit wählen
'
),
timeText
:
$gettext
(
'
Zeit
'
),
hourText
:
$gettext
(
'
Stunde
'
),
minuteText
:
$gettext
(
'
Minute
'
),
secondText
:
$gettext
(
'
Sekunde
'
),
millisecText
:
$gettext
(
'
Millisekunde
'
),
microsecText
:
$gettext
(
'
Mikrosekunde
'
),
timezoneText
:
$gettext
(
'
Zeitzone
'
),
timeFormat
:
$gettext
(
'
HH:mm
'
),
amNames
:
[
$gettext
(
'
vorm.
'
),
'
AM
'
,
'
A
'
],
pmNames
:
[
$gettext
(
'
nachm.
'
),
'
PM
'
,
'
P
'
]
};
// Set dayNamesMin to dayNamesShort since they are equal
locale
.
dayNamesMin
=
locale
.
dayNamesShort
;
// Setup Stud.IP's own datepicker extensions
STUDIP
.
UI
=
STUDIP
.
UI
||
{};
STUDIP
.
UI
.
Datepicker
=
{
...
...
@@ -527,7 +452,7 @@ import { $gettext } from './lib/gettext.js';
};
// Apply defaults including date picker handlers
defaults
=
Object
.
assign
({},
locale
,
{
const
defaults
=
{
beforeShow
(
input
)
{
STUDIP
.
UI
.
Datepicker
.
refresh
();
STUDIP
.
UI
.
DateTimepicker
.
refresh
();
...
...
@@ -548,9 +473,10 @@ import { $gettext } from './lib/gettext.js';
$
(
this
).
change
();
}
}
}
)
;
};
$
.
datepicker
.
setDefaults
(
Object
.
assign
({},
defaults
,
{
$
.
datepicker
.
setDefaults
({
...
defaults
,
beforeShow
(
input
)
{
// Don't lose original behaviour
defaults
.
beforeShow
(
input
);
...
...
@@ -583,7 +509,88 @@ import { $gettext } from './lib/gettext.js';
$
(
window
).
unbind
(
'
scroll.datepicker-scroll
'
);
}
}
}));
});
$
.
timepicker
.
setDefaults
(
defaults
);
eventBus
.
on
(
'
studip:set-locale
'
,
()
=>
{
const
locale
=
{
closeText
:
$gettext
(
'
Schließen
'
),
prevText
:
$gettext
(
'
Zurück
'
),
nextText
:
$gettext
(
'
Vor
'
),
currentText
:
$gettext
(
'
Jetzt
'
),
monthNames
:
[
$gettext
(
'
Januar
'
),
$gettext
(
'
Februar
'
),
$gettext
(
'
März
'
),
$gettext
(
'
April
'
),
$gettext
(
'
Mai
'
),
$gettext
(
'
Juni
'
),
$gettext
(
'
Juli
'
),
$gettext
(
'
August
'
),
$gettext
(
'
September
'
),
$gettext
(
'
Oktober
'
),
$gettext
(
'
November
'
),
$gettext
(
'
Dezember
'
)
],
monthNamesShort
:
[
$gettext
(
'
Jan
'
),
$gettext
(
'
Feb
'
),
$gettext
(
'
Mär
'
),
$gettext
(
'
Apr
'
),
$gettext
(
'
Mai
'
),
$gettext
(
'
Jun
'
),
$gettext
(
'
Jul
'
),
$gettext
(
'
Aug
'
),
$gettext
(
'
Sep
'
),
$gettext
(
'
Okt
'
),
$gettext
(
'
Nov
'
),
$gettext
(
'
Dez
'
)
],
dayNames
:
[
$gettext
(
'
Sonntag
'
),
$gettext
(
'
Montag
'
),
$gettext
(
'
Dienstag
'
),
$gettext
(
'
Mittwoch
'
),
$gettext
(
'
Donnerstag
'
),
$gettext
(
'
Freitag
'
),
$gettext
(
'
Samstag
'
)
],
dayNamesShort
:
[
$gettext
(
'
So
'
),
$gettext
(
'
Mo
'
),
$gettext
(
'
Di
'
),
$gettext
(
'
Mi
'
),
$gettext
(
'
Do
'
),
$gettext
(
'
Fr
'
),
$gettext
(
'
Sa
'
)
],
weekHeader
:
$gettext
(
'
Wo
'
),
dateFormat
:
'
dd.mm.yy
'
,
firstDay
:
1
,
isRTL
:
false
,
showMonthAfterYear
:
false
,
yearSuffix
:
''
,
changeMonth
:
true
,
changeYear
:
true
,
timeOnlyTitle
:
$gettext
(
'
Zeit wählen
'
),
timeText
:
$gettext
(
'
Zeit
'
),
hourText
:
$gettext
(
'
Stunde
'
),
minuteText
:
$gettext
(
'
Minute
'
),
secondText
:
$gettext
(
'
Sekunde
'
),
millisecText
:
$gettext
(
'
Millisekunde
'
),
microsecText
:
$gettext
(
'
Mikrosekunde
'
),
timezoneText
:
$gettext
(
'
Zeitzone
'
),
timeFormat
:
$gettext
(
'
HH:mm
'
),
amNames
:
[
$gettext
(
'
vorm.
'
),
'
AM
'
,
'
A
'
],
pmNames
:
[
$gettext
(
'
nachm.
'
),
'
PM
'
,
'
P
'
]
};
// Set dayNamesMin to dayNamesShort since they are equal
locale
.
dayNamesMin
=
locale
.
dayNamesShort
;
$
.
datepicker
.
setDefaults
(
locale
);
$
.
timepicker
.
setDefaults
(
locale
);
});
var
DpHideOnScroll
=
function
()
{
var
input
=
arguments
[
0
];
...
...
@@ -598,10 +605,6 @@ import { $gettext } from './lib/gettext.js';
this
.
_selectDate
(
id
);
};
$
.
timepicker
.
setDefaults
(
Object
.
assign
({},
defaults
,
{
timeFormat
:
'
HH:mm
'
}));
// Attach global focus handler on date picker elements
$
(
document
).
on
(
'
focus
'
,
STUDIP
.
UI
.
Datepicker
.
selector
,
()
=>
{
STUDIP
.
UI
.
Datepicker
.
init
();
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
sign in
to comment