diff --git a/youtube_dl/extractor/franceinter.py b/youtube_dl/extractor/franceinter.py index ec57e3e67..fd2f18e25 100644 --- a/youtube_dl/extractor/franceinter.py +++ b/youtube_dl/extractor/franceinter.py @@ -4,7 +4,7 @@ from __future__ import unicode_literals from .common import InfoExtractor from ..utils import ( unified_timestamp, - month_by_french_name, + month_by_name, ) @@ -37,7 +37,7 @@ class FranceInterIE(InfoExtractor): extractdate = self._search_regex('(\d{2}-([a-zA-Z\s]+)-\d{4}$)', url, 'extractdate', fatal=False) extractdate = extractdate.split('-') - extractdate = extractdate[2] + "," + str(month_by_french_name(extractdate[1])) + "," + extractdate[0] + extractdate = extractdate[2] + "," + str(month_by_name(extractdate[1],'fr')) + "," + extractdate[0] timestamp = unified_timestamp(extractdate) diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py index 847c3bc96..a8f5f1876 100644 --- a/youtube_dl/utils.py +++ b/youtube_dl/utils.py @@ -93,7 +93,7 @@ ENGLISH_MONTH_NAMES = [ FRENCH_MONTH_NAMES = [ 'janvier', 'fevrier', 'mars', 'avril', 'mai', 'juin', - 'juillet', 'août', 'septembre', 'octobre', 'novembre', 'decembre'] + 'juillet', 'aout', 'septembre', 'octobre', 'novembre', 'decembre'] KNOWN_EXTENSIONS = ( 'mp4', 'm4a', 'm4p', 'm4b', 'm4r', 'm4v', 'aac', @@ -1591,20 +1591,16 @@ def parse_count(s): return lookup_unit_table(_UNIT_TABLE, s) -def month_by_name(name): +def month_by_name(name, lang='en'): """ Return the number of a month by (locale-independently) English name """ - try: - return ENGLISH_MONTH_NAMES.index(name) + 1 - except ValueError: - return None + name_list = ENGLISH_MONTH_NAMES - -def month_by_french_name(name): - """ Return the number of a month by French name """ + if lang == 'fr': + name_list = FRENCH_MONTH_NAMES try: - return FRENCH_MONTH_NAMES.index(name) + 1 + return name_list.index(name) + 1 except ValueError: return None