diff --git a/CHANGELOG.md b/CHANGELOG.md index f4336d6..01abbc2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,13 @@ *Applanga CLI Documentation:* *** -### Version 1.0.103 (10 Dec 2024) +### Version 1.0.104 (19 Dec 2024) +#### Fixed +- Added improved contradictory configuration error +- Fixed init script for windows file path conversion +--- + +### Version 1.0.103 (10 Dez 2024) #### Fixed - Fixed contradictory configurations error messages for ios / ios_stringsdict overlap --- diff --git a/README.md b/README.md index fb3187f..22a683d 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Applanga Localization Command Line Interface (CLI) *** -*Version:* 1.0.103 +*Version:* 1.0.104 *Website:* diff --git a/commands/init.py b/commands/init.py index 4e3aafd..caf1b72 100644 --- a/commands/init.py +++ b/commands/init.py @@ -146,7 +146,7 @@ def init(ctx): default_baselanguage_path = constants.FILE_FORMATS[file_format]['default_baselanguage_path'] if platform.system() == 'Windows': # If we are in Windows convert into correct format - default_baselanguage_path = files.convertToWindowsPath(defaultdefault_baselanguage_path_source_baselanguage_path) + default_baselanguage_path = files.convertToWindowsPath(default_baselanguage_path) baselanguage_path = input('Base language path [\"%s\"]: ' % default_baselanguage_path) baselanguage_path = baselanguage_path or default_baselanguage_path diff --git a/lib/config_file.py b/lib/config_file.py index 5f56fc5..c1291ad 100644 --- a/lib/config_file.py +++ b/lib/config_file.py @@ -4,6 +4,7 @@ import platform import json from functools import cmp_to_key +from pathlib import Path class ApplangaConfigFileNotValidException(Exception): @@ -175,8 +176,10 @@ def compareTag(self, other): return tagEqual def ignoreFormatOverlap(self, other): + if Path(self.path).stem != Path(other.path).stem: + return False for exclude in constants.EXCLUDE_FORMAT_OVERLAP: - if (self.file_format == exclude[0] and other.file_format == exclude[1]) or (self.file_format == exclude[1] and other.file_format == exclude[0]): + if ((self.file_format == exclude[0] and other.file_format == exclude[1]) or (self.file_format == exclude[1] and other.file_format == exclude[0])): return True return False diff --git a/lib/constants.py b/lib/constants.py index e64e5e2..b3fd6fd 100644 --- a/lib/constants.py +++ b/lib/constants.py @@ -1,4 +1,4 @@ -VERSION_NUMBER = '1.0.103' +VERSION_NUMBER = '1.0.104' APPLANGA_HOST = 'https://api.applanga.com' API_BASE_PATH = '/v1/api' CONFIG_FILE_NAME = '.applanga.json'