oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Automatically escape all variables in translation underline func helper

Browse source
This commit is contained in:
shortcutme 2018-11-26 00:09:24 +01:00
parent 74e551cf1a
commit d3885eefda
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 26 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/Translate/Translate.py
View file

@ -3,11 +3,28 @@ import json
import logging import logging
import inspect import inspect
import re import re
import cgi
import string
from Config import config from Config import config
translates = [] translates = []
class EscapeProxy(dict):
# Automatically escape the accessed string values
def __getitem__(self, key):
val = dict.__getitem__(self, key)
if type(val) in (str, unicode):
return cgi.escape(val, quote=True)
elif type(val) is dict:
return EscapeProxy(val)
elif type(val) is list:
return EscapeProxy(enumerate(val)) # Convert lists to dict
else:
return val
class Translate(dict): class Translate(dict):
def __init__(self, lang_dir=None, lang=None): def __init__(self, lang_dir=None, lang=None):
if not lang_dir: if not lang_dir:
@ -17,6 +34,7 @@ class Translate(dict):
self.lang = lang self.lang = lang
self.lang_dir = lang_dir self.lang_dir = lang_dir
self.setLanguage(lang) self.setLanguage(lang)
self.formatter = string.Formatter()
if config.debug: if config.debug:
# Auto reload FileRequest on change # Auto reload FileRequest on change
@ -55,19 +73,20 @@ class Translate(dict):
def format(self, s, kwargs, nested=False): def format(self, s, kwargs, nested=False):
kwargs["_"] = self kwargs["_"] = self
if nested: if nested:
return s.format(**kwargs).format(**kwargs) back = self.formatter.vformat(s, [], kwargs) # PY3 TODO: Change to format_map
return self.formatter.vformat(back, [], kwargs)
else: else:
return s.format(**kwargs) return self.formatter.vformat(s, [], kwargs)
def formatLocals(self, s, nested=False): def formatLocals(self, s, nested=False):
kwargs = inspect.currentframe().f_back.f_locals kwargs = inspect.currentframe().f_back.f_locals
return self.format(s, kwargs, nested=nested) return self.format(s, kwargs, nested=nested)
def __call__(self, s, kwargs=None, nested=False): def __call__(self, s, kwargs=None, nested=False, escape=True):
if kwargs: if not kwargs:
return self.format(s, kwargs, nested=nested)
else:
kwargs = inspect.currentframe().f_back.f_locals kwargs = inspect.currentframe().f_back.f_locals
if escape:
kwargs = EscapeProxy(kwargs)
return self.format(s, kwargs, nested=nested) return self.format(s, kwargs, nested=nested)
def __missing__(self, key): def __missing__(self, key):