simon
/
domoboard
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #73 from dutchdevil83/develop 

Add local language support for date/time
This commit is contained in:
Squandor 2017-01-16 14:22:46 +01:00 committed by GitHub
parent 1adf9877f3 fc8ba7c125
commit a98d3b5b6a
5 changed files with 12919 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
example.conf
View File

@ -10,6 +10,7 @@
[[domoboard]] [[domoboard]]
time = False # True/False: show time in top bar time = False # True/False: show time in top bar
date = False # True/False: show date in top bar date = False # True/False: show date in top bar
language = "gb" # Change this to display date/time in local language and format
google_maps_api_key = X # Google Maps Embed API key google_maps_api_key = X # Google Maps Embed API key
# Add Navbar items here. The key is the navbar link name. The first value is the URI name, second value can be any font awesome logo to be displayed. # Add Navbar items here. The key is the navbar link name. The first value is the URI name, second value can be any font awesome logo to be displayed.

12910
static/js/moment-with-locales.js Normal file
View File

File diff suppressed because it is too large Load Diff

10
templates/footer.html
View File

@ -10,15 +10,17 @@
<script src="/static/js/custom.js"></script> <script src="/static/js/custom.js"></script>
<!-- bootstrap-slider --> <!-- bootstrap-slider -->
<script type="text/javascript" src="/static/js/bootstrap-slider.js"></script> <script type="text/javascript" src="/static/js/bootstrap-slider.js"></script>
<script type="text/javascript" src="static/js/moment.min.js"></script> <script type="text/javascript" src="static/js/moment-with-locales.js"></script>
{% if configValues["domoboard"].get("time") == "True" %} {% if configValues["domoboard"].get("time") == "True" %}
<script> <script>
$(document).ready(function() { $(document).ready(function() {
var interval = setInterval(function() { var interval = setInterval(function() {
var momentNow = moment(); var momentNow = moment();
$('#date-part').html(momentNow.format('DD MMMM YYYY'));
$('#date-part').html(momentNow.locale(local_language).format('dddd D MMMM YYYY'));
$('#time-part').html(momentNow.format('HH:mm'));
$('#time-part').html(momentNow.format('HH:mm'));
}, 100); }, 100);
{% if configValues["domoboard"].get("date") == "True" %} {% if configValues["domoboard"].get("date") == "True" %}
$('#date-part').removeClass('hide_date'); $('#date-part').removeClass('hide_date');

1
templates/header.html
View File

@ -62,6 +62,7 @@
var flask_server = "{{ request.url_root[:-1] }}"; var flask_server = "{{ request.url_root[:-1] }}";
var csrf_token = "{{ _csrf_token }}"; var csrf_token = "{{ _csrf_token }}";
var googleMapEmbedKey = "{{ configValues["domoboard"].get("google_maps_api_key") }}" var googleMapEmbedKey = "{{ configValues["domoboard"].get("google_maps_api_key") }}"
var local_language = "{{ configValues["domoboard"].get("language") }}"
var version = "{{ version }}"; var version = "{{ version }}";
</script> </script>
<script type="text/javascript" src="/static/js/domoboard.js"></script> <script type="text/javascript" src="/static/js/domoboard.js"></script>

2
templates/navbar.html
View File

@ -61,7 +61,7 @@
<div class="nav toggle navbar-collapse" id="defaultNavbar1"> <div class="nav toggle navbar-collapse" id="defaultNavbar1">
<a id="menu_toggle"><i class="fa fa-bars"></i></a> <a id="menu_toggle"><i class="fa fa-bars"></i></a>
</div> </div>
<div class="show_date" style="cursor: pointer; margin-left: -70px; min-height: 51px;" id="time-part"></div> <div class="show_date" style="cursor: pointer; float: right; margin-left: -70px; min-height: 51px;" id="time-part"></div>
<div class="hide_date" style="cursor: pointer; padding-left: 2px;" id="date-part"></div> <div class="hide_date" style="cursor: pointer; padding-left: 2px;" id="date-part"></div>
<div id="version_div" class="hide_update"> <div id="version_div" class="hide_update">
<button type="button" class="btn btn-success" data-toggle="modal" data-target="#upgradeModal"> <button type="button" class="btn btn-success" data-toggle="modal" data-target="#upgradeModal">