summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2018-02-28 17:39:26 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2018-02-28 17:40:22 +0100
commit729cf40814f7c3167253d49ae55f7c3bcdc437dc (patch)
treea5fc13721582831503e88d67602593bd01372e49
parentc2d60a414e788d3802c01883681480a4cfe7308c (diff)
downloadIshtar-729cf40814f7c3167253d49ae55f7c3bcdc437dc.tar.bz2
Ishtar-729cf40814f7c3167253d49ae55f7c3bcdc437dc.zip
Datatables: translate "selected rows"
-rw-r--r--archaeological_finds/models_finds.py6
-rw-r--r--ishtar_common/static/datatables/i18n/fr.js17
-rw-r--r--version.py4
3 files changed, 20 insertions, 7 deletions
diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py
index c93e4844f..7f36492a1 100644
--- a/archaeological_finds/models_finds.py
+++ b/archaeological_finds/models_finds.py
@@ -211,6 +211,7 @@ class BaseFind(BulkUpdatedItem, BaseHistorizedItem, OwnPerms):
external_id = models.TextField(_(u"External ID"), blank=True, null=True)
auto_external_id = models.BooleanField(
_(u"External ID is set automatically"), default=False)
+ #excavation_id = models.TextField(_(u"Excavation ID"), blank=True, null=True)
description = models.TextField(_(u"Description"), blank=True, null=True)
comment = models.TextField(_(u"Comment"), blank=True, null=True)
special_interest = models.CharField(_(u"Special interest"), blank=True,
@@ -679,7 +680,12 @@ class Find(BulkUpdatedItem, ValueGetter, BaseHistorizedItem, ImageModel,
_(u"External ID is set automatically"), default=False)
order = models.IntegerField(_(u"Order"), default=1)
label = models.TextField(_(u"Free ID"))
+ #denomination = models.TextField(_(u"Label"), blank=True, null=True)
+ #museum_id = models.TextField(_(u"Museum ID"), blank=True, null=True)
description = models.TextField(_(u"Description"), blank=True, null=True)
+ #decoration = models.TextField(_(u"Decoration"), blank=True, null=True)
+ #manufacturing_place = models.TextField(
+ # _(u"Manufacturing place"), blank=True, null=True)
material_types = models.ManyToManyField(
MaterialType, verbose_name=_(u"Material types"), related_name='finds',
blank=True
diff --git a/ishtar_common/static/datatables/i18n/fr.js b/ishtar_common/static/datatables/i18n/fr.js
index c9748a0fd..4e51d8790 100644
--- a/ishtar_common/static/datatables/i18n/fr.js
+++ b/ishtar_common/static/datatables/i18n/fr.js
@@ -2,13 +2,13 @@ var datatables_i18n = {
processing: "Traitement en cours...",
search: "Rechercher&nbsp;:",
lengthMenu: "Afficher _MENU_ &eacute;l&eacute;ments",
- info: "Affichage de l'&eacute;lement _START_ &agrave; _END_ sur _TOTAL_ &eacute;l&eacute;ments",
- infoEmpty: "Affichage de l'&eacute;lement 0 &agrave; 0 sur 0 &eacute;l&eacute;ments",
+ info: "Affichage de l'&eacute;lement _START_ &agrave; _END_ sur _TOTAL_ &eacute;l&eacute;ment(s)",
+ infoEmpty: "Affichage de l'&eacute;lement 0 &agrave; 0 sur 0 &eacute;l&eacute;ment",
infoFiltered: "(filtr&eacute; de _MAX_ &eacute;l&eacute;ments au total)",
infoPostFix: "",
loadingRecords: "Chargement en cours...",
zeroRecords: "Aucun &eacute;l&eacute;ment &agrave; afficher",
- emptyTable: "Aucune donnée disponible dans le tableau",
+ emptyTable: "Aucune donn&eacute;e disponible dans le tableau",
paginate: {
first: "Premier",
previous: "Pr&eacute;c&eacute;dent",
@@ -17,6 +17,13 @@ var datatables_i18n = {
},
aria: {
sortAscending: ": activer pour trier la colonne par ordre croissant",
- sortDescending: ": activer pour trier la colonne par ordre décroissant"
- }
+ sortDescending: ": activer pour trier la colonne par ordre d&eacute;croissant"
+ },
+ select: {
+ rows: {
+ _: '%d lignes s&eacute;lectionn&eacute;es',
+ 0: 'aucune ligne s&eacute;lectionn&eacute;e',
+ 1: '1 ligne s&eacute;lectionn&eacute;e'
+ }
+ }
};
diff --git a/version.py b/version.py
index 227b5a401..4285fe459 100644
--- a/version.py
+++ b/version.py
@@ -1,5 +1,5 @@
-# 1.99.16
-VERSION = (1, 99, 16)
+# 1.99.17
+VERSION = (1, 99, 17)
def get_version():