librelogo/source/LibreLogo/LibreLogo.py | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 708554c0973718174c60eb566bb846146994b786
Author: Julien Nabet <serval2...@yahoo.fr>
Date: Sun Nov 27 19:39:41 2016 +0100
tdf#101603: fix lgnpath for MacOs in LibreLogo
Change-Id: I280b6cd02a98037a71701a6a7a540c87de22d07f
Reviewed-on: https://gerrit.libreoffice.org/31268
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
(cherry picked from commit ab3b5b0dfb0c92aa5e94a0f417950724c694ac57)
Reviewed-on: https://gerrit.libreoffice.org/31269
Tested-by: Julien Nabet <serval2...@yahoo.fr>
diff --git a/librelogo/source/LibreLogo/LibreLogo.py
b/librelogo/source/LibreLogo/LibreLogo.py
index dcd8609..f51202c 100644
--- a/librelogo/source/LibreLogo/LibreLogo.py
+++ b/librelogo/source/LibreLogo/LibreLogo.py
@@ -21,8 +21,12 @@ urebootstrap = os.environ["URE_BOOTSTRAP"]
if "vnd.sun.star.pathname" in urebootstrap:
__lngpath__ =
re.sub(r"^vnd.sun.star.pathname:(.*)program(/|\\)fundamental([.]ini|rc)$",
"\\1", urebootstrap)
else:
- __lngpath__ =
unohelper.fileUrlToSystemPath(re.sub("program/(fundamental.ini|fundamentalrc)$",
"", urebootstrap))
-__lngpath__ = __lngpath__ + "share/Scripts/python/LibreLogo/".replace("/",
os.sep)
+ # A way to know if we use MacOs
+ if "Resources" in urebootstrap:
+ __lngpath__ = unohelper.fileUrlToSystemPath(re.sub("fundamentalrc$",
"", urebootstrap))
+ else:
+ __lngpath__ =
unohelper.fileUrlToSystemPath(re.sub("program/(fundamental.ini|fundamentalrc)$",
"share", urebootstrap))
+__lngpath__ = __lngpath__ + "/Scripts/python/LibreLogo/".replace("/", os.sep)
__translang__ =
"am|ca|cs|de|dk|el|en|eo|es|et|fr|hu|it|ja|nl|no|pl|pt|ru|se|sl" # FIXME
supported languages for language guessing, expand this list, according to the
localizations
__lng__ = {}
__docs__ = {}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
