NunoSempere/calibre-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'cn/fix/bootstrap-table-locale'

Browse Source 
# Conflicts:
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-af.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ar.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-bg.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ca.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-cs.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-da.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-de.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-el.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-et.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-eu.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fa.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fi.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fr.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-he.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-hr.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-hu.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-id.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-it.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ja.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ka.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ko.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-nl.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-pl.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-pt_BR.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ro.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ru.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sk.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sv.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-tr.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-uk.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-zh_Hans_CN.min.js
This commit is contained in:
Ozzie Isaacs 2021-10-16 11:48:00 +02:00
commit fe21d15194
26 changed files with 19 additions and 215 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cps/static/js/libs/bootstrap-table/bootstrap-table-locale-all.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

10
cps/static/js/libs/bootstrap-table/locale/bootstrap-table-en-US.min.js vendored
View File

File diff suppressed because one or more lines are too long

10
cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-AR.min.js vendored
View File

File diff suppressed because one or more lines are too long

10
cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-CL.min.js vendored
View File

File diff suppressed because one or more lines are too long

10
cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-CR.min.js vendored
View File

File diff suppressed because one or more lines are too long

10
cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-MX.min.js vendored
View File

File diff suppressed because one or more lines are too long

10
cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-NI.min.js vendored
View File

File diff suppressed because one or more lines are too long

10
cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-SP.min.js vendored
View File

File diff suppressed because one or more lines are too long

10
cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fr-BE.min.js vendored
View File

File diff suppressed because one or more lines are too long

10
cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fr-CH.min.js vendored
View File

File diff suppressed because one or more lines are too long

10
cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fr-LU.min.js vendored
View File

File diff suppressed because one or more lines are too long

10
cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ms-MY.min.js vendored
View File

File diff suppressed because one or more lines are too long

10
cps/static/js/libs/bootstrap-table/locale/bootstrap-table-nb-NO.min.js vendored
View File

File diff suppressed because one or more lines are too long

10
cps/static/js/libs/bootstrap-table/locale/bootstrap-table-nl-BE.min.js vendored
View File

File diff suppressed because one or more lines are too long

10
cps/static/js/libs/bootstrap-table/locale/bootstrap-table-pt-PT.min.js vendored
View File

File diff suppressed because one or more lines are too long

10
cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sr-Cyrl-RS.min.js vendored
View File

File diff suppressed because one or more lines are too long

10
cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sr-Latn-RS.min.js vendored
View File

File diff suppressed because one or more lines are too long

10
cps/static/js/libs/bootstrap-table/locale/bootstrap-table-th-TH.min.js vendored
View File

File diff suppressed because one or more lines are too long

10
cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ur-PK.min.js vendored
View File

File diff suppressed because one or more lines are too long

10
cps/static/js/libs/bootstrap-table/locale/bootstrap-table-uz-Latn-UZ.min.js vendored
View File

File diff suppressed because one or more lines are too long

10
cps/static/js/libs/bootstrap-table/locale/bootstrap-table-vi-VN.min.js vendored
View File

File diff suppressed because one or more lines are too long

10
cps/static/js/libs/bootstrap-table/locale/bootstrap-table-zh-TW.min.js vendored
View File

File diff suppressed because one or more lines are too long

3
cps/templates/book_table.html
View File

@ -42,7 +42,7 @@
</div> </div>
<table id="books-table" class="table table-no-bordered table-striped" <table id="books-table" class="table table-no-bordered table-striped"
data-url="{{url_for('web.list_books')}}"> data-url="{{url_for('web.list_books')}}" data-locale="{{ g.user.locale }}">
<thead> <thead>
<tr> <tr>
{% if g.user.role_edit() %} {% if g.user.role_edit() %}
@ -97,6 +97,7 @@
{% endblock %} {% endblock %}
{% block js %} {% block js %}
<script src="{{ url_for('static', filename='js/libs/bootstrap-table/bootstrap-table.min.js') }}"></script> <script src="{{ url_for('static', filename='js/libs/bootstrap-table/bootstrap-table.min.js') }}"></script>
<script src="{{ url_for('static', filename='js/libs/bootstrap-table/bootstrap-table-locale-all.min.js') }}"></script>
<script src="{{ url_for('static', filename='js/libs/bootstrap-table/bootstrap-table-editable.min.js') }}"></script> <script src="{{ url_for('static', filename='js/libs/bootstrap-table/bootstrap-table-editable.min.js') }}"></script>
<script src="{{ url_for('static', filename='js/libs/bootstrap-table/bootstrap-editable.min.js') }}"></script> <script src="{{ url_for('static', filename='js/libs/bootstrap-table/bootstrap-editable.min.js') }}"></script>
{% if not g.user.locale == 'en' %} {% if not g.user.locale == 'en' %}

5
cps/templates/email_edit.html
View File

@ -80,7 +80,7 @@
</div> </div>
<button id="domain_allow_submit" class="btn btn-default">{{_('Add')}}</button> <button id="domain_allow_submit" class="btn btn-default">{{_('Add')}}</button>
</form> </form>
<table class="table table-no-bordered" id="domain-allow-table" data-url="{{url_for('admin.list_domain', allow=1)}}" data-id-field="id" data-show-header="false" data-editable-mode="inline"> <table class="table table-no-bordered" id="domain-allow-table" data-url="{{url_for('admin.list_domain', allow=1)}}" data-id-field="id" data-show-header="false" data-editable-mode="inline" data-locale="{{ g.user.locale }}">
<thead> <thead>
<tr> <tr>
<th data-field="domain" id="domain-allow" data-escape="true" data-editable-type="text" data-editable-url="{{ url_for('admin.edit_domain', allow = 1)}}" data-editable="true" data-editable-title="{{_('Enter domainname')}}"></th> <th data-field="domain" id="domain-allow" data-escape="true" data-editable-type="text" data-editable-url="{{ url_for('admin.edit_domain', allow = 1)}}" data-editable="true" data-editable-title="{{_('Enter domainname')}}"></th>
@ -90,7 +90,7 @@
</thead> </thead>
</table> </table>
<h2>{{_('Denied Domains (Blacklist)')}}</h2> <h2>{{_('Denied Domains (Blacklist)')}}</h2>
<table class="table table-no-bordered" id="domain-deny-table" data-url="{{url_for('admin.list_domain', allow=0)}}" data-id-field="id" data-show-header="false" data-editable-mode="inline"> <table class="table table-no-bordered" id="domain-deny-table" data-url="{{url_for('admin.list_domain', allow=0)}}" data-id-field="id" data-show-header="false" data-editable-mode="inline" data-locale="{{ g.user.locale }}">
<thead> <thead>
<tr> <tr>
<th data-field="domain" id="domain-deny" data-escape="true" data-editable-type="text" data-editable-url="{{ url_for('admin.edit_domain', allow = 0)}}" data-editable="true" data-editable-title="{{_('Enter domainname')}}"></th> <th data-field="domain" id="domain-deny" data-escape="true" data-editable-type="text" data-editable-url="{{ url_for('admin.edit_domain', allow = 0)}}" data-editable="true" data-editable-title="{{_('Enter domainname')}}"></th>
@ -120,6 +120,7 @@
{% block js %} {% block js %}
{% if g.allow_registration %} {% if g.allow_registration %}
<script src="{{ url_for('static', filename='js/libs/bootstrap-table/bootstrap-table.min.js') }}"></script> <script src="{{ url_for('static', filename='js/libs/bootstrap-table/bootstrap-table.min.js') }}"></script>
<script src="{{ url_for('static', filename='js/libs/bootstrap-table/bootstrap-table-locale-all.min.js') }}"></script>
<script src="{{ url_for('static', filename='js/libs/bootstrap-table/bootstrap-table-editable.min.js') }}"></script> <script src="{{ url_for('static', filename='js/libs/bootstrap-table/bootstrap-table-editable.min.js') }}"></script>
<script src="{{ url_for('static', filename='js/libs/bootstrap-table/bootstrap-editable.min.js') }}"></script> <script src="{{ url_for('static', filename='js/libs/bootstrap-table/bootstrap-editable.min.js') }}"></script>
<script src="{{ url_for('static', filename='js/table.js') }}"></script> <script src="{{ url_for('static', filename='js/table.js') }}"></script>

3
cps/templates/tasks.html
View File

@ -5,7 +5,7 @@
{% block body %} {% block body %}
<div class="discover"> <div class="discover">
<h2>{{_('Tasks')}}</h2> <h2>{{_('Tasks')}}</h2>
<table class="table table-no-bordered" id="tasktable" data-url="{{ url_for('web.get_email_status_json') }}" data-sort-name="starttime" data-sort-order="asc"> <table class="table table-no-bordered" id="tasktable" data-url="{{ url_for('web.get_email_status_json') }}" data-sort-name="starttime" data-sort-order="asc" data-locale="{{ g.user.locale }}">
<thead> <thead>
<tr> <tr>
{% if g.user.role_admin() %} {% if g.user.role_admin() %}
@ -25,6 +25,7 @@
{% endblock %} {% endblock %}
{% block js %} {% block js %}
<script src="{{ url_for('static', filename='js/libs/bootstrap-table/bootstrap-table.min.js') }}"></script> <script src="{{ url_for('static', filename='js/libs/bootstrap-table/bootstrap-table.min.js') }}"></script>
<script src="{{ url_for('static', filename='js/libs/bootstrap-table/bootstrap-table-locale-all.min.js') }}"></script>
<script src="{{ url_for('static', filename='js/table.js') }}"></script> <script src="{{ url_for('static', filename='js/table.js') }}"></script>
{% endblock %} {% endblock %}

3
cps/templates/user_table.html
View File

@ -125,7 +125,7 @@
</div> </div>
</div> </div>
<table id="user-table" class="table table-no-bordered table-striped" <table id="user-table" class="table table-no-bordered table-striped"
data-url="{{url_for('admin.list_users')}}"> data-url="{{url_for('admin.list_users')}}" data-locale="{{ g.user.locale }}">
<thead> <thead>
<tr> <tr>
<th data-name="edit" data-buttontext="{{_('Edit User')}}" data-visible="{{visiblility.get('edit')}}" data-formatter="singleUserFormatter">{{_('Edit')}}</th> <th data-name="edit" data-buttontext="{{_('Edit User')}}" data-visible="{{visiblility.get('edit')}}" data-formatter="singleUserFormatter">{{_('Edit')}}</th>
@ -181,6 +181,7 @@
{% endblock %} {% endblock %}
{% block js %} {% block js %}
<script src="{{ url_for('static', filename='js/libs/bootstrap-table/bootstrap-table.min.js') }}"></script> <script src="{{ url_for('static', filename='js/libs/bootstrap-table/bootstrap-table.min.js') }}"></script>
<script src="{{ url_for('static', filename='js/libs/bootstrap-table/bootstrap-table-locale-all.min.js') }}"></script>
<script src="{{ url_for('static', filename='js/libs/bootstrap-table/bootstrap-table-editable.min.js') }}"></script> <script src="{{ url_for('static', filename='js/libs/bootstrap-table/bootstrap-table-editable.min.js') }}"></script>
<script src="{{ url_for('static', filename='js/libs/bootstrap-table/bootstrap-editable.min.js') }}"></script> <script src="{{ url_for('static', filename='js/libs/bootstrap-table/bootstrap-editable.min.js') }}"></script>
<script src="{{ url_for('static', filename='js/libs/bootstrap-select.min.js')}}"></script> <script src="{{ url_for('static', filename='js/libs/bootstrap-select.min.js')}}"></script>