help-to-wiki.py | 10 ++++++---- source/text/shared/guide/redlining_navigation.xhp | 2 -- to-wiki/getalltitles.py | 2 +- to-wiki/wikiconv2.py | 7 ++++--- upload-wiki.pl | 1 + 5 files changed, 12 insertions(+), 10 deletions(-)
New commits: commit 5c5dd57b54e3107b3069dc8f82df74df63d13555 Author: Andras Timar <[email protected]> Date: Mon Jun 3 09:43:04 2013 +0200 Hardcode 4.0 version - it will be available as help.libreoffice.org/4.0 Change-Id: Icaa20b41c8582b7057ebeb3d25e6688cf03af41e diff --git a/help-to-wiki.py b/help-to-wiki.py index 42aa072..7c5bcce 100755 --- a/help-to-wiki.py +++ b/help-to-wiki.py @@ -49,6 +49,7 @@ def create_wiki_dirs(): ] try: + os.mkdir( "wiki" ) os.mkdir( "wiki/4.0" ) except: sys.stdout.write( "wiki already generated - the wiki/ subdir exists\n" ) commit 94727de4dacd1180f8f44760f3b7529ff1feade3 Author: Andras Timar <[email protected]> Date: Mon Jun 3 09:39:36 2013 +0200 Hardcode 4.0 version - it will be available as help.libreoffice.org/4.0 Change-Id: I63fa0615e20debe924404f66d65d86ad41d2d2e1 diff --git a/help-to-wiki.py b/help-to-wiki.py index 19d58ed..42aa072 100755 --- a/help-to-wiki.py +++ b/help-to-wiki.py @@ -49,14 +49,14 @@ def create_wiki_dirs(): ] try: - os.mkdir( "wiki" ) + os.mkdir( "wiki/4.0" ) except: sys.stdout.write( "wiki already generated - the wiki/ subdir exists\n" ) sys.exit( 1 ) for i in dirs: try: - os.mkdir( "wiki/" + i ) + os.mkdir( "wiki/4.0" + i ) except: pass diff --git a/to-wiki/getalltitles.py b/to-wiki/getalltitles.py index 8db9bcb..8ec6a89 100755 --- a/to-wiki/getalltitles.py +++ b/to-wiki/getalltitles.py @@ -130,7 +130,7 @@ def parsexhp(filename): title = tp.get_title() if len(title) > 0: readable_title = readable_text(title) - title = module + '/' + wiki_text(title) + title = '4.0' + module + '/' + wiki_text(title) title = title.replace(' ', '_') title = title.replace('___', '_') title = title.replace('__', '_') commit 7ce1a40e82bea15cfb47644c457e6b6a6a4e0306 Author: Andras Timar <[email protected]> Date: Fri May 10 14:18:19 2013 +0200 fdo#64205 escape '' in help text with <nowiki> tag Change-Id: I07fed20194bcb4223c1070866fd147388da57ba9 Reviewed-on: https://gerrit.libreoffice.org/3845 Reviewed-by: Fridrich Strba <[email protected]> Tested-by: Fridrich Strba <[email protected]> diff --git a/to-wiki/wikiconv2.py b/to-wiki/wikiconv2.py index 00d43d2..fb19eae 100755 --- a/to-wiki/wikiconv2.py +++ b/to-wiki/wikiconv2.py @@ -129,7 +129,8 @@ replace_text_list = \ [["$[officename]", "{{ProductName}}"], ["%PRODUCTNAME", "{{ProductName}}"], ["$PRODUCTNAME", "{{ProductName}}"], - ["font size", u"\u200dfont size"] + ["font size", u"\u200dfont size"], + ["''","<nowiki>''</nowiki>"] ] def get_link_filename(link, name): commit ec760d0ab5cc2237e01e6a1d15a7cca49fafa3e3 Author: Andras Timar <[email protected]> Date: Tue May 7 14:49:56 2013 +0200 fdo#64211 replace / to %2F in HIDs for wiki redirects Change-Id: I93780b76e17a3b833ef4ee6a50bb0969ab8bb01c Reviewed-on: https://gerrit.libreoffice.org/3811 Reviewed-by: Jan Holesovsky <[email protected]> Tested-by: Jan Holesovsky <[email protected]> diff --git a/to-wiki/wikiconv2.py b/to-wiki/wikiconv2.py index 0e3bb5b..00d43d2 100755 --- a/to-wiki/wikiconv2.py +++ b/to-wiki/wikiconv2.py @@ -457,7 +457,7 @@ class Bookmark(ElementBase): self.app = parser.current_app_raw self.target = parser.wiki_page_name self.authoritative = parser.follow_embed - self.redirect = name + self.redirect = name.replace("/", "%2F") def get_all(self): global redirects @@ -1359,7 +1359,7 @@ def write_link(r, target): def write_redirects(): print 'Generating the redirects...' written = {} - # in the first pass, immediately writte the links that are embedded, so that + # in the first pass, immediately write the links that are embedded, so that # we can always point to that source versions for redir in redirects: app = redir[0] diff --git a/upload-wiki.pl b/upload-wiki.pl index 1337900..13e2bc6 100755 --- a/upload-wiki.pl +++ b/upload-wiki.pl @@ -120,6 +120,7 @@ sub upload_article { my $pagename = $File::Find::name; $pagename =~ s/^wiki\///; $pagename =~ s/\/MAIN$//; + $pagename =~ s/%2F/\//g; # pages starting with lowercase 's' are redirects if ( $pagename =~ /^s/ ) { commit 9bef603e2ea8837b33a690bf4f36873f727d71d6 Author: Andras Timar <[email protected]> Date: Mon Apr 8 12:15:34 2013 +0200 another typo Change-Id: I33f3114581328b5d2b343a486f4b9067fd00540e diff --git a/help-to-wiki.py b/help-to-wiki.py index e8df1bc..19d58ed 100755 --- a/help-to-wiki.py +++ b/help-to-wiki.py @@ -61,7 +61,7 @@ def create_wiki_dirs(): pass # Langs to handle (fully translated or otherwise important) -langs = ['', 'ast', 'bg', 'bn', 'bn_IN', 'ca', 'cs', 'da', 'de', \ +langs = ['', 'ast', 'bg', 'bn', 'bn-IN', 'ca', 'cs', 'da', 'de', \ 'el', 'es', 'eu', 'fi', 'fr', 'hu', 'it', 'ja', 'km', \ 'ko', 'nb', 'nl', 'om', 'pl', 'pt', 'pt-BR', 'ru', \ 'sl', 'sv', 'tr', 'vi', 'zh-CN', 'zh-TW' ] commit f8ceeab4b87451e9da3828c81e88922c9297f457 Author: Andras Timar <[email protected]> Date: Mon Apr 8 08:54:42 2013 +0200 typo Change-Id: I1a2c3ddbbb5511bca67880b4366b4d8045d7d04b Signed-off-by: Andras Timar <[email protected]> diff --git a/help-to-wiki.py b/help-to-wiki.py index 706e85f..e8df1bc 100755 --- a/help-to-wiki.py +++ b/help-to-wiki.py @@ -61,7 +61,7 @@ def create_wiki_dirs(): pass # Langs to handle (fully translated or otherwise important) -langs = ['', 'ast', 'bg', 'bn', bn_IN', 'ca', 'cs', 'da', 'de', \ +langs = ['', 'ast', 'bg', 'bn', 'bn_IN', 'ca', 'cs', 'da', 'de', \ 'el', 'es', 'eu', 'fi', 'fr', 'hu', 'it', 'ja', 'km', \ 'ko', 'nb', 'nl', 'om', 'pl', 'pt', 'pt-BR', 'ru', \ 'sl', 'sv', 'tr', 'vi', 'zh-CN', 'zh-TW' ] commit 103f9c29b96d7a62aff99d07a8424d8d96a10994 Author: Andras Timar <[email protected]> Date: Thu Apr 4 11:12:25 2013 +0200 add more languages to WikiHelp Change-Id: I4210f948f464b9f7e4eebe9bf92f9f94ee691d8b Reviewed-on: https://gerrit.libreoffice.org/3200 Reviewed-by: Michael Meeks <[email protected]> Tested-by: Michael Meeks <[email protected]> diff --git a/help-to-wiki.py b/help-to-wiki.py index 0ee17ba..706e85f 100755 --- a/help-to-wiki.py +++ b/help-to-wiki.py @@ -60,9 +60,10 @@ def create_wiki_dirs(): except: pass -# Langs to handle -langs = ['', 'ca', 'cs', 'da', 'de', 'es', 'fr', 'hu', \ - 'it', 'ja', 'ko', 'nl', 'pl', 'pt', 'pt-BR', 'ru', \ +# Langs to handle (fully translated or otherwise important) +langs = ['', 'ast', 'bg', 'bn', bn_IN', 'ca', 'cs', 'da', 'de', \ + 'el', 'es', 'eu', 'fi', 'fr', 'hu', 'it', 'ja', 'km', \ + 'ko', 'nb', 'nl', 'om', 'pl', 'pt', 'pt-BR', 'ru', \ 'sl', 'sv', 'tr', 'vi', 'zh-CN', 'zh-TW' ] # Argument handling commit a7654ca4509c497a6dac76333735ca8692d18e10 Author: Andras Timar <[email protected]> Date: Tue Feb 5 10:48:29 2013 +0100 remove unnecessary <section> </section> pair Change-Id: I0cc3c32b782921afd29718eece64e57975fbea16 Signed-off-by: Andras Timar <[email protected]> diff --git a/source/text/shared/guide/redlining_navigation.xhp b/source/text/shared/guide/redlining_navigation.xhp index 686e48c..7682f0b 100644 --- a/source/text/shared/guide/redlining_navigation.xhp +++ b/source/text/shared/guide/redlining_navigation.xhp @@ -24,7 +24,6 @@ <bookmark_value>review function; navigating changes</bookmark_value> </bookmark> <paragraph id="par_id3153880" role="heading" xml-lang="en-US" level="1"><variable id="redlining_navigation"><link href="text/shared/guide/redlining_navigation.xhp" name="Navigating Changes">Navigating Changes</link></variable></paragraph> - <section> <paragraph id="par_id3153881" role="note" xml-lang="en-US">This feature is Writer-specific.</paragraph> <paragraph id="par_id3153882" role="paragraph" xml-lang="en-US">There are two available commands to navigate changes in a Writer document:</paragraph> <list type="unordered"> @@ -38,7 +37,6 @@ </listitem> </list> <paragraph id="par_id3153885" role="paragraph" xml-lang="en-US">Using these commands in conjunction with the <emph>Accept Change</emph> and <emph>Reject Change</emph> commands allows navigating, accepting and rejecting changes without invoking the <emph>Edit - Changes - Accept or Reject</emph> dialog.</paragraph> - </section> <section id="relatedtopics"> <embed href="text/shared/guide/redlining.xhp#redlining"/> <embed href="text/shared/guide/redlining_accept.xhp#redlining_accept"/> _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
