2 new commits in clipContentsDesigner:
https://bitbucket.org/nvdaaddonteam/clipcontentsdesigner/commits/b937d107c77e/
Changeset: b937d107c77e
Branch: None
User: norrumar
Date: 2019-11-16 21:06:48+00:00
Summary: Remove not needed u to ensure unicode
Affected #: 1 file
diff --git a/addon/globalPlugins/clipContentsDesigner/__init__.py
b/addon/globalPlugins/clipContentsDesigner/__init__.py
index 0ecfad7..c530418 100644
--- a/addon/globalPlugins/clipContentsDesigner/__init__.py
+++ b/addon/globalPlugins/clipContentsDesigner/__init__.py
@@ -329,7 +329,7 @@ class GlobalPlugin(globalPluginHandler.GlobalPlugin):
ui.browseableMessage(
browseableText,
# Translators: title of a browseable message.
- _(u"Clipboard text ({max}/{current} -
{formatForTitle})".format(max=maxLength, current=len(text),
formatForTitle=BROWSEABLETEXT_FORMATS[format])),
+ _("Clipboard text ({max}/{current} -
{formatForTitle})".format(max=maxLength, current=len(text),
formatForTitle=BROWSEABLETEXT_FORMATS[format])),
html
)
https://bitbucket.org/nvdaaddonteam/clipcontentsdesigner/commits/40e7b57eeabe/
Changeset: 40e7b57eeabe
Branch: 2019.3
User: norrumar
Date: 2019-11-16 21:12:36+00:00
Summary: Update sconstruct according to pcKbBrl, already tested
Affected #: 1 file
diff --git a/sconstruct b/sconstruct
index d1e3c76..e890d97 100644
--- a/sconstruct
+++ b/sconstruct
@@ -3,7 +3,6 @@
#This file is covered by the GNU General Public License.
#See the file COPYING.txt for more details.
-import codecs
import gettext
import os
import os.path
@@ -19,7 +18,7 @@ def md2html(source, dest):
lang = os.path.basename(os.path.dirname(source)).replace('_', '-')
localeLang = os.path.basename(os.path.dirname(source))
try:
- _ = gettext.translation("nvda", localedir=os.path.join("addon",
"locale"), languages=[localeLang]).ugettext if sys.version_info.major == 2 else
gettext.translation("nvda", localedir=os.path.join("addon", "locale"),
languages=[localeLang]).gettext
+ _ = gettext.translation("nvda", localedir=os.path.join("addon",
"locale"), languages=[localeLang]).gettext
title=u"{0}".format(_(buildVars.addon_info["addon_summary"]))
except:
title="{0}".format(buildVars.addon_info["addon_summary"])
@@ -27,20 +26,18 @@ def md2html(source, dest):
"[[!meta title=\"": "# ",
"\"]]": " #",
}
- with codecs.open(source, "r", "utf-8") as f:
+ with open(source, 'r', encoding="utf-8") as f:
mdText = f.read()
- headerList = headerDic.iteritems () if sys.version_info.major
== 2 else list(headerDic.items())
- for k, v in headerList:
+ for k, v in headerDic.items():
mdText = mdText.replace(k, v, 1)
htmlText = markdown.markdown(mdText)
- with codecs.open(dest, "w", "utf-8") as f:
- f.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
- "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0
Strict//EN\"\n" +
- "
\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\";>\n" +
- "<html xmlns=\"http://www.w3.org/1999/xhtml\" ;
xml:lang=\"%s\" lang=\"%s\">\n" % (lang, lang) +
+ with open(dest, 'w', encoding="utf-8") as f:
+ f.write("<!DOCTYPE html>\n" +
+ "<html lang=\"%s\">\n" % lang +
"<head>\n" +
- "<meta http-equiv=\"Content-Type\" content=\"text/html;
charset=UTF-8\"/>\n" +
- "<link rel=\"stylesheet\" type=\"text/css\"
href=\"../style.css\" media=\"screen\"/>\n" +
+ "<meta charset=\"UTF-8\">\n" +
+ "<meta name=\"viewport\" content=\"width=device-width,
initial-scale=1.0\">\n" +
+ "<link rel=\"stylesheet\" type=\"text/css\"
href=\"../style.css\" media=\"screen\">\n" +
"<title>%s</title>\n" % title +
"</head>\n<body>\n"
)
@@ -109,21 +106,27 @@ def createAddonBundleFromPath(path, dest):
return dest
def generateManifest(source, dest):
- with codecs.open(source, "r", "utf-8") as f:
+ with open(source, 'r', encoding="utf-8") as f:
manifest_template = f.read()
manifest = manifest_template.format(**buildVars.addon_info)
- with codecs.open(dest, "w", "utf-8") as f:
+ with open(dest, 'w', encoding="utf-8") as f:
f.write(manifest)
def generateTranslatedManifest(source, language, out):
- _ = gettext.translation("nvda", localedir=os.path.join("addon",
"locale"), languages=[language]).ugettext if sys.version_info.major == 2 else
gettext.translation("nvda", localedir=os.path.join("addon", "locale"),
languages=[language]).gettext
+ _ = gettext.translation("nvda", localedir=os.path.join("addon",
"locale"), languages=[language]).gettext
vars = {}
for var in ("addon_summary", "addon_description"):
- vars[var] = _(buildVars.addon_info[var])
- with codecs.open(source, "r", "utf-8") as f:
+ if isinstance(buildVars.addon_info[var], str):
+ vars[var] = _(buildVars.addon_info[var])
+ elif isinstance(buildVars.addon_info[var], list):
+ vars[var] = ''.join([_(l) for l in
buildVars.addon_info[var]])
+ else:
+ raise TypeError("Error with %s key in buildVars" % var)
+
+ with open(source, 'r', encoding="utf-8") as f:
manifest_template = f.read()
result = manifest_template.format(**vars)
- with codecs.open(out, "w", "utf-8") as f:
+ with open(out, 'w', encoding="utf-8") as f:
f.write(result)
def expandGlobs(files):
@@ -167,10 +170,10 @@ for dir in langDirs:
translatedManifest =
env.NVDATranslatedManifest(dir.File("manifest.ini"), [moFile,
os.path.join("manifest-translated.ini.tpl")])
env.Depends(translatedManifest, ["buildVars.py"])
env.Depends(addon, [translatedManifest, moFile])
- #Convert markdown files to html
- for mdFile in env.Glob(os.path.join('addon', 'doc', '*', '*.md')):
- htmlFile = env.markdown(mdFile)
- env.Depends(htmlFile, [mdFile, moFile])
- env.Depends(addon, htmlFile)
+#Convert markdown files to html
+for mdFile in env.Glob(os.path.join('addon', 'doc', '*', '*.md')):
+ htmlFile = env.markdown(mdFile)
+ env.Depends(htmlFile, mdFile)
+ env.Depends(addon, htmlFile)
env.Default(addon)
env.Clean (addon, ['.sconsign.dblite', 'addon/doc/en/'])
Repository URL: https://bitbucket.org/nvdaaddonteam/clipcontentsdesigner/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
