merge back some french modules from gramps41
This commit is contained in:
Jérôme Rapinat
parent
91fe0fe083
commit
084e56d1aa
@ -77,7 +77,7 @@ class DateParserFR(DateParser):
|
||||
'vers' : Date.MOD_ABOUT,
|
||||
'~' : Date.MOD_ABOUT,
|
||||
}
|
||||
|
||||
|
||||
quality_to_int = {
|
||||
'estimée': Date.QUAL_ESTIMATED,
|
||||
'est.' : Date.QUAL_ESTIMATED,
|
||||
@ -96,7 +96,7 @@ class DateParserFR(DateParser):
|
||||
def init_strings(self):
|
||||
"""
|
||||
This method compiles regular expression strings for matching dates.
|
||||
|
||||
|
||||
Most of the re's in most languages can stay as is. span and range
|
||||
most likely will need to change. Whatever change is done, this method
|
||||
may be called first as DateParser.init_strings(self) so that the
|
||||
@ -105,13 +105,13 @@ class DateParserFR(DateParser):
|
||||
override stuff from this method. See DateParserRU() as an example.
|
||||
"""
|
||||
DateParser.init_strings(self)
|
||||
|
||||
|
||||
DateParser.calendar_to_int.update({
|
||||
'révolutionnaire' : Date.CAL_FRENCH,
|
||||
'r' : Date.CAL_FRENCH,
|
||||
'perse' : Date.CAL_PERSIAN,
|
||||
})
|
||||
|
||||
|
||||
DateParser.month_to_int.update({
|
||||
"januaris" : 1,
|
||||
"januarii" : 1,
|
||||
@ -155,7 +155,7 @@ class DateParserFR(DateParser):
|
||||
"ernting" : 8,
|
||||
"septembris" : 9,
|
||||
"7bre" : 9,
|
||||
"7bris" : 9,
|
||||
"7bris" : 9,
|
||||
"september" : 9,
|
||||
"scheidling" : 9,
|
||||
"october" : 10,
|
||||
@ -163,7 +163,7 @@ class DateParserFR(DateParser):
|
||||
"8bre" : 10,
|
||||
"8bris" : 10,
|
||||
"gilbhard" : 10,
|
||||
"november" : 11,
|
||||
"november" : 11,
|
||||
"novembris" : 11,
|
||||
"9bre" : 11,
|
||||
"9bris" : 11,
|
||||
@ -177,15 +177,15 @@ class DateParserFR(DateParser):
|
||||
"xbris" : 12,
|
||||
"julmond" : 12,
|
||||
"christmond" : 12,
|
||||
})
|
||||
|
||||
})
|
||||
|
||||
# This self._numeric is different from the base
|
||||
# avoid bug gregorian / french calendar conversion (+/-10 days)
|
||||
|
||||
self._numeric = re.compile("((\d+)[/\. ])?\s*((\d+)[/\.])?\s*(\d+)\s*$")
|
||||
self._span = re.compile("(de)\s+(?P<start>.+)\s+(à)\s+(?P<stop>.+)",
|
||||
self._numeric = re.compile(r"((\d+)[/\. ])?\s*((\d+)[/\.])?\s*(\d+)\s*$")
|
||||
self._span = re.compile(r"(de)\s+(?P<start>.+)\s+(à)\s+(?P<stop>.+)",
|
||||
re.IGNORECASE)
|
||||
self._range = re.compile("(entre|ent\.|ent)\s+(?P<start>.+)\s+(et)\s+(?P<stop>.+)",
|
||||
self._range = re.compile(r"(entre|ent\.|ent)\s+(?P<start>.+)\s+(et)\s+(?P<stop>.+)",
|
||||
re.IGNORECASE)
|
||||
|
||||
# This self._text are different from the base
|
||||
@ -193,32 +193,32 @@ class DateParserFR(DateParser):
|
||||
|
||||
#gregorian and julian
|
||||
|
||||
self._text2 = re.compile('(\d+)?.?\s+?%s\s*((\d+)(/\d+)?)?' %
|
||||
self._text2 = re.compile(r'(\d+)?.?\s+?%s\s*((\d+)(/\d+)?)?' %
|
||||
self._mon_str, re.IGNORECASE)
|
||||
|
||||
#hebrew
|
||||
|
||||
self._jtext2 = re.compile('(\d+)?.?\s+?%s\s*((\d+)(/\d+)?)?' %
|
||||
self._jtext2 = re.compile(r'(\d+)?.?\s+?%s\s*((\d+)(/\d+)?)?' %
|
||||
self._jmon_str, re.IGNORECASE)
|
||||
|
||||
#french
|
||||
|
||||
self._ftext2 = re.compile('(\d+)?.?\s+?%s\s*((\d+)(/\d+)?)?' %
|
||||
self._ftext2 = re.compile(r'(\d+)?.?\s+?%s\s*((\d+)(/\d+)?)?' %
|
||||
self._fmon_str, re.IGNORECASE)
|
||||
|
||||
#persian
|
||||
|
||||
self._ptext2 = re.compile('(\d+)?.?\s+?%s\s*((\d+)(/\d+)?)?' %
|
||||
self._ptext2 = re.compile(r'(\d+)?.?\s+?%s\s*((\d+)(/\d+)?)?' %
|
||||
self._pmon_str, re.IGNORECASE)
|
||||
|
||||
#islamic
|
||||
|
||||
self._itext2 = re.compile('(\d+)?.?\s+?%s\s*((\d+)(/\d+)?)?' %
|
||||
self._itext2 = re.compile(r'(\d+)?.?\s+?%s\s*((\d+)(/\d+)?)?' %
|
||||
self._imon_str, re.IGNORECASE)
|
||||
|
||||
#swedish
|
||||
|
||||
self._stext2 = re.compile('(\d+)?.?\s+?%s\s*((\d+)(/\d+)?)?' %
|
||||
self._stext2 = re.compile(r'(\d+)?.?\s+?%s\s*((\d+)(/\d+)?)?' %
|
||||
self._smon_str, re.IGNORECASE)
|
||||
|
||||
#-------------------------------------------------------------------------
|
||||
@ -228,7 +228,7 @@ class DateParserFR(DateParser):
|
||||
#-------------------------------------------------------------------------
|
||||
class DateDisplayFR(DateDisplay):
|
||||
"""
|
||||
French language date display class.
|
||||
French language date display class.
|
||||
"""
|
||||
|
||||
_bce_str = "%s avant le calendrier"
|
||||
@ -239,7 +239,7 @@ class DateDisplayFR(DateDisplay):
|
||||
_locale_tformat = _locale_tformat.replace('%d', "J")
|
||||
_locale_tformat = _locale_tformat.replace('%m', "M")
|
||||
_locale_tformat = _locale_tformat.replace('%Y', "A")
|
||||
|
||||
|
||||
formats = ("AAAA-MM-JJ (ISO)", # 0
|
||||
"Défaut système (" + _locale_tformat + ")", # 1
|
||||
"Jour Mois Année", # 2
|
||||
@ -247,8 +247,8 @@ class DateDisplayFR(DateDisplay):
|
||||
"Jour. Mois Année", # 4
|
||||
"Jour. MOI Année", # 5
|
||||
"Mois Jour, Année", # 6
|
||||
"MOI Jour, Année", # 7
|
||||
)
|
||||
"MOI Jour, Année",) # 7
|
||||
|
||||
# this definition must agree with its "_display_gregorian" method
|
||||
|
||||
def _display_gregorian(self, date_val, **kwargs):
|
||||
@ -291,7 +291,7 @@ class DateDisplayFR(DateDisplay):
|
||||
value = "%s %s" % (self.long_months[date_val[1]], year)
|
||||
else:
|
||||
|
||||
value = "%d %s %s" % (date_val[0],
|
||||
value = "%d %s %s" % (date_val[0],
|
||||
self.long_months[date_val[1]], year)
|
||||
elif self.format == 3:
|
||||
|
||||
@ -304,7 +304,7 @@ class DateDisplayFR(DateDisplay):
|
||||
value = "%s %s" % (self.short_months[date_val[1]], year)
|
||||
else:
|
||||
|
||||
value = "%d %s %s" % (date_val[0],
|
||||
value = "%d %s %s" % (date_val[0],
|
||||
self.short_months[date_val[1]], year)
|
||||
elif self.format == 4:
|
||||
|
||||
@ -318,10 +318,10 @@ class DateDisplayFR(DateDisplay):
|
||||
else:
|
||||
|
||||
# base_display :
|
||||
# value = "%d %s %s" % (date_val[0],
|
||||
# value = "%d %s %s" % (date_val[0],
|
||||
# self.long_months[date_val[1]], year)
|
||||
|
||||
value = "%d. %s %s" % (date_val[0],
|
||||
value = "%d. %s %s" % (date_val[0],
|
||||
self.long_months[date_val[1]],
|
||||
year)
|
||||
elif self.format == 5:
|
||||
@ -336,11 +336,11 @@ class DateDisplayFR(DateDisplay):
|
||||
else:
|
||||
|
||||
# base_display :
|
||||
# value = "%d %s %s" % (date_val[0],
|
||||
# value = "%d %s %s" % (date_val[0],
|
||||
# self.short_months[date_val[1]], year)
|
||||
|
||||
value = "%d. %s %s" % (date_val[0],
|
||||
self.short_months[date_val[1]], year)
|
||||
value = "%d. %s %s" % (date_val[0],
|
||||
self.short_months[date_val[1]], year)
|
||||
elif self.format == 6:
|
||||
|
||||
# month_name day, year
|
||||
@ -367,12 +367,12 @@ class DateDisplayFR(DateDisplay):
|
||||
date_val[0], year)
|
||||
else:
|
||||
return self.display_iso(date_val)
|
||||
|
||||
|
||||
if date_val[2] < 0:
|
||||
return self._bce_str % value
|
||||
else:
|
||||
return value
|
||||
|
||||
|
||||
display = DateDisplay.display_formatted
|
||||
|
||||
#-------------------------------------------------------------------------
|
||||
@ -382,4 +382,4 @@ class DateDisplayFR(DateDisplay):
|
||||
#-------------------------------------------------------------------------
|
||||
|
||||
register_datehandler(('fr_FR', 'fr', 'french', 'French', 'fr_CA',
|
||||
'fr_BE', 'fr_CH'), DateParserFR, DateDisplayFR)
|
||||
'fr_BE', 'fr_CH'), DateParserFR, DateDisplayFR)
|
||||
|
||||
29
po/fr.po
29
po/fr.po
@ -260,7 +260,7 @@ msgstr "<b>Gérer les sources</b><br/>La vue Sources affiche une liste de toutes
|
||||
# comté, province (Canada, Belgique)
|
||||
#: ../data/tips.xml.in.h:39
|
||||
msgid "<b>Managing Places</b><br/>The Places View shows a list of all places in the database. The list can be sorted by a number of different criteria, such as City, County or State."
|
||||
msgstr "<b>Gérer les lieux</b><br/>La vue Lieux affiche une liste de lieux. Cette liste peut être triée selon différents critères, comme la ville, le département (comté) ou la région (province)."
|
||||
msgstr "<b>Gérer les lieux</b><br/>La vue Lieux affiche une liste de lieux. Cette liste peut être triée selon différents critères, comme la ville, le comté (département) ou la province (région)."
|
||||
|
||||
#: ../data/tips.xml.in.h:40
|
||||
msgid "<b>Media View</b><br/>The Media View shows a list of all media entered in the database. These can be graphic images, videos, sound clips, spreadsheets, documents, and more."
|
||||
@ -4896,12 +4896,12 @@ msgstr "Ville :"
|
||||
# comté (Canada)
|
||||
#: ../gramps/gen/filters/rules/place/_hasplace.py:52
|
||||
msgid "County:"
|
||||
msgstr "Départ./Comté :"
|
||||
msgstr "Comté (Départ.) :"
|
||||
|
||||
# province (Belgique, Canada)
|
||||
#: ../gramps/gen/filters/rules/place/_hasplace.py:53
|
||||
msgid "State:"
|
||||
msgstr "Région/Province :"
|
||||
msgstr "Province (Région) :"
|
||||
|
||||
#: ../gramps/gen/filters/rules/place/_hasplace.py:54
|
||||
msgid "Country:"
|
||||
@ -6468,7 +6468,7 @@ msgstr "Pays "
|
||||
#: ../gramps/plugins/tool/extractcity.py:390
|
||||
#: ../gramps/plugins/webreport/narrativeweb.py:3366
|
||||
msgid "State"
|
||||
msgstr "Région/Province"
|
||||
msgstr "Province (Région)"
|
||||
|
||||
# comté (Canada)
|
||||
#: ../gramps/gen/lib/placetype.py:71
|
||||
@ -6478,7 +6478,7 @@ msgstr "Région/Province"
|
||||
#: ../gramps/plugins/lib/maps/placeselection.py:146
|
||||
#: ../gramps/plugins/webreport/narrativeweb.py:373
|
||||
msgid "County"
|
||||
msgstr "Départ./Comté"
|
||||
msgstr "Comté (Départ.)"
|
||||
|
||||
# L'espace finale est pour précéder le « : » codé en dur dans certains contextes.
|
||||
# /!\ vérifier double espace avec search bar "%(titre colonne)s contient"
|
||||
@ -6543,17 +6543,17 @@ msgstr "Quartier"
|
||||
# trunk
|
||||
#: ../gramps/gen/lib/placetype.py:80
|
||||
msgid "District"
|
||||
msgstr "Arrondissement départemental"
|
||||
msgstr "District (Arrondissement)"
|
||||
|
||||
# trunk
|
||||
#: ../gramps/gen/lib/placetype.py:81
|
||||
msgid "Borough"
|
||||
msgstr "Arrondissement municipal"
|
||||
msgstr "Borough (Arrondissement)"
|
||||
|
||||
# trunk
|
||||
#: ../gramps/gen/lib/placetype.py:82
|
||||
msgid "Municipality"
|
||||
msgstr "Lieu-dit "
|
||||
msgstr "Municipalité"
|
||||
|
||||
# trunk
|
||||
#: ../gramps/gen/lib/placetype.py:83
|
||||
@ -6575,7 +6575,6 @@ msgstr "Hameau"
|
||||
msgid "Farm"
|
||||
msgstr "Ferme"
|
||||
|
||||
# Substantif (GNOME fr)
|
||||
# trunk
|
||||
#: ../gramps/gen/lib/placetype.py:87
|
||||
msgid "Building"
|
||||
@ -8958,7 +8957,7 @@ msgstr "Entrez une information pour permettre aux personnes de vous contacter qu
|
||||
#: ../gramps/gui/editors/displaytabs/addrembedlist.py:75
|
||||
#: ../gramps/plugins/view/repoview.py:92
|
||||
msgid "State/County"
|
||||
msgstr "Région/Départ./Comté "
|
||||
msgstr "Province/Comté "
|
||||
|
||||
# L'espace finale est pour précéder le « : » codé en dur dans certains contextes.
|
||||
# Utilisation d'un terme général (Code lieu) car le code postal ne sert à rien en généalogie.
|
||||
@ -12476,7 +12475,7 @@ msgstr "La ville ou le village de l'adresse"
|
||||
#: ../gramps/gui/glade/editaddress.glade:166
|
||||
#: ../gramps/plugins/tool/ownereditor.glade:172
|
||||
msgid "_State/County:"
|
||||
msgstr "_Région/Départ./Comté :"
|
||||
msgstr "_Province/Comté :"
|
||||
|
||||
# Utilisation d'un terme général (Code lieu) car le code postal ne sert à rien en généalogie.
|
||||
#: ../gramps/gui/glade/editaddress.glade:185
|
||||
@ -12504,7 +12503,7 @@ msgstr "Numéro de téléphone lié à l'adresse."
|
||||
|
||||
#: ../gramps/gui/glade/editaddress.glade:268
|
||||
msgid "The state or county of the address in case a mail address must contain this."
|
||||
msgstr "La région ou le département de l'adresse au cas où une adresse postale en a besoin."
|
||||
msgstr "La province (région) ou le comté (département) de l'adresse au cas où une adresse postale en a besoin."
|
||||
|
||||
#: ../gramps/gui/glade/editaddress.glade:283
|
||||
msgid "Country of the address"
|
||||
@ -12983,7 +12982,7 @@ msgstr "La plus petite division religieuse du lieu. Typiquement utilisé pour le
|
||||
# comté (Canada)
|
||||
#: ../gramps/gui/glade/editlocation.glade:176
|
||||
msgid "Co_unty:"
|
||||
msgstr "_Départ./Comté :"
|
||||
msgstr "Co_mté (Départ.):"
|
||||
|
||||
#: ../gramps/gui/glade/editlocation.glade:192
|
||||
msgid "Third level of place division. Eg., in the USA a county."
|
||||
@ -12992,7 +12991,7 @@ msgstr "Le troisième niveau de division du lieu. Par exemple aux USA le comté.
|
||||
# province (Canada, Belgique)
|
||||
#: ../gramps/gui/glade/editlocation.glade:208
|
||||
msgid "_State:"
|
||||
msgstr "_Région/Province :"
|
||||
msgstr "_Province (Région) :"
|
||||
|
||||
#: ../gramps/gui/glade/editlocation.glade:226
|
||||
msgid "Second level of place division, eg., in the USA a state, in Germany a Bundesland."
|
||||
@ -27706,7 +27705,7 @@ msgstr "Ville : %s "
|
||||
#: ../gramps/plugins/textreport/placereport.py:162
|
||||
#, python-format
|
||||
msgid "County: %s "
|
||||
msgstr "Départ./Comté : %s "
|
||||
msgstr "Comté (dép.) : %s "
|
||||
|
||||
# province (Canada, Belgique)
|
||||
#: ../gramps/plugins/textreport/placereport.py:163
|
||||
|
||||
Loading…
Reference in New Issue
Block a user