Skip to content

Commit

Permalink
Merge pull request AUTOMATIC1111#13077 from sdwebui-extensions/master
Browse files Browse the repository at this point in the history
fix localization when there are multi same localization file in the extensions
  • Loading branch information
AUTOMATIC1111 authored Sep 30, 2023
2 parents 4e5d252 + 413123f commit 3aa9f01
Showing 1 changed file with 12 additions and 9 deletions.
21 changes: 12 additions & 9 deletions modules/localization.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,24 @@ def list_localizations(dirname):
if ext.lower() != ".json":
continue

localizations[fn] = os.path.join(dirname, file)
localizations[fn] = [os.path.join(dirname, file)]

for file in scripts.list_scripts("localizations", ".json"):
fn, ext = os.path.splitext(file.filename)
localizations[fn] = file.path
if fn not in localizations:
localizations[fn] = []
localizations[fn].append(file.path)


def localization_js(current_localization_name: str) -> str:
fn = localizations.get(current_localization_name, None)
fns = localizations.get(current_localization_name, None)
data = {}
if fn is not None:
try:
with open(fn, "r", encoding="utf8") as file:
data = json.load(file)
except Exception:
errors.report(f"Error loading localization from {fn}", exc_info=True)
if fns is not None:
for fn in fns:
try:
with open(fn, "r", encoding="utf8") as file:
data.update(json.load(file))
except Exception:
errors.report(f"Error loading localization from {fn}", exc_info=True)

return f"window.localization = {json.dumps(data)}"

0 comments on commit 3aa9f01

Please sign in to comment.