From 864e9613e44d79afaec4a17a3961c4e1de793ca1 Mon Sep 17 00:00:00 2001 From: UlrichB22 <97119703+UlrichB22@users.noreply.github.com> Date: Mon, 5 Feb 2024 15:20:07 +0100 Subject: [PATCH] Rename dir and parm en to help-en, common to help-common --- docs/admin/install.rst | 8 ++++---- docs/devel/development.rst | 10 +++++----- src/moin/cli/_tests/conftest.py | 6 +++--- src/moin/cli/_tests/test_modify_item.py | 12 ++++++------ src/moin/cli/maint/create_instance.py | 6 +++--- src/moin/cli/maint/modify_item.py | 11 +++++------ .../{common => help-common}/archive.tar.gz.data | Bin .../{common => help-common}/archive.tar.gz.meta | 0 .../help/{common => help-common}/archive.zip.data | Bin .../help/{common => help-common}/archive.zip.meta | 0 .../help/{common => help-common}/audio.mp3.data | Bin .../help/{common => help-common}/audio.mp3.meta | 0 src/moin/help/{common => help-common}/cat.jpg.data | Bin src/moin/help/{common => help-common}/cat.jpg.meta | 0 src/moin/help/{common => help-common}/logo.png.data | Bin src/moin/help/{common => help-common}/logo.png.meta | 0 src/moin/help/{common => help-common}/logo.svg.data | 0 src/moin/help/{common => help-common}/logo.svg.meta | 0 .../help/{common => help-common}/video.mp4.data | Bin .../help/{common => help-common}/video.mp4.meta | 0 src/moin/help/{en => help-en}/Home%2fsubitem.data | 0 src/moin/help/{en => help-en}/Home%2fsubitem.meta | 0 src/moin/help/{en => help-en}/Home.data | 0 src/moin/help/{en => help-en}/Home.meta | 0 .../{en => help-en}/InclusionForMoinWikiMacros.data | 0 .../{en => help-en}/InclusionForMoinWikiMacros.meta | 0 .../{en => help-en}/MoinWikiMacros%2fIcons.data | 0 .../{en => help-en}/MoinWikiMacros%2fIcons.meta | 0 .../MoinWikiMacros%2fMonthCalendar.data | 0 .../MoinWikiMacros%2fMonthCalendar.meta | 0 src/moin/help/{en => help-en}/MoinWikiMacros.data | 0 src/moin/help/{en => help-en}/MoinWikiMacros.meta | 0 .../help/{en => help-en}/OtherTextItems%2fCSV.data | 0 .../help/{en => help-en}/OtherTextItems%2fCSV.meta | 0 .../help/{en => help-en}/OtherTextItems%2fDiff.data | 0 .../help/{en => help-en}/OtherTextItems%2fDiff.meta | 0 .../help/{en => help-en}/OtherTextItems%2fIRC.data | 0 .../help/{en => help-en}/OtherTextItems%2fIRC.meta | 0 .../{en => help-en}/OtherTextItems%2fPlainText.data | 0 .../{en => help-en}/OtherTextItems%2fPlainText.meta | 0 .../{en => help-en}/OtherTextItems%2fPython.data | 0 .../{en => help-en}/OtherTextItems%2fPython.meta | 0 src/moin/help/{en => help-en}/OtherTextItems.data | 0 src/moin/help/{en => help-en}/OtherTextItems.meta | 0 src/moin/help/{en => help-en}/Sibling.data | 0 src/moin/help/{en => help-en}/Sibling.meta | 0 src/moin/help/{en => help-en}/TemplateSample.data | 0 src/moin/help/{en => help-en}/TemplateSample.meta | 0 src/moin/help/{en => help-en}/WikiDict.data | 0 src/moin/help/{en => help-en}/WikiDict.meta | 0 src/moin/help/{en => help-en}/creole%2fsubitem.data | 0 src/moin/help/{en => help-en}/creole%2fsubitem.meta | 0 src/moin/help/{en => help-en}/creole.data | 0 src/moin/help/{en => help-en}/creole.meta | 0 .../help/{en => help-en}/docbook%2fSubItem.data | 0 .../help/{en => help-en}/docbook%2fSubItem.meta | 0 src/moin/help/{en => help-en}/docbook.data | 0 src/moin/help/{en => help-en}/docbook.meta | 0 src/moin/help/{en => help-en}/html%2fSubItem.data | 0 src/moin/help/{en => help-en}/html%2fSubItem.meta | 0 src/moin/help/{en => help-en}/html.data | 0 src/moin/help/{en => help-en}/html.meta | 0 src/moin/help/{en => help-en}/images.data | 0 src/moin/help/{en => help-en}/images.meta | 0 .../help/{en => help-en}/markdown%2fSubitem.data | 0 .../help/{en => help-en}/markdown%2fSubitem.meta | 0 src/moin/help/{en => help-en}/markdown.data | 0 src/moin/help/{en => help-en}/markdown.meta | 0 src/moin/help/{en => help-en}/mediawiki.data | 0 src/moin/help/{en => help-en}/mediawiki.meta | 0 .../{en => help-en}/moin%2fHighlighterList.data | 0 .../{en => help-en}/moin%2fHighlighterList.meta | 0 src/moin/help/{en => help-en}/moin%2fsubitem.data | 0 src/moin/help/{en => help-en}/moin%2fsubitem.meta | 0 src/moin/help/{en => help-en}/moin.data | 0 src/moin/help/{en => help-en}/moin.meta | 0 src/moin/help/{en => help-en}/rst%2fsubitem.data | 0 src/moin/help/{en => help-en}/rst%2fsubitem.meta | 0 src/moin/help/{en => help-en}/rst.data | 0 src/moin/help/{en => help-en}/rst.meta | 0 80 files changed, 26 insertions(+), 27 deletions(-) rename src/moin/help/{common => help-common}/archive.tar.gz.data (100%) rename src/moin/help/{common => help-common}/archive.tar.gz.meta (100%) rename src/moin/help/{common => help-common}/archive.zip.data (100%) rename src/moin/help/{common => help-common}/archive.zip.meta (100%) rename src/moin/help/{common => help-common}/audio.mp3.data (100%) rename src/moin/help/{common => help-common}/audio.mp3.meta (100%) rename src/moin/help/{common => help-common}/cat.jpg.data (100%) rename src/moin/help/{common => help-common}/cat.jpg.meta (100%) rename src/moin/help/{common => help-common}/logo.png.data (100%) rename src/moin/help/{common => help-common}/logo.png.meta (100%) rename src/moin/help/{common => help-common}/logo.svg.data (100%) rename src/moin/help/{common => help-common}/logo.svg.meta (100%) rename src/moin/help/{common => help-common}/video.mp4.data (100%) rename src/moin/help/{common => help-common}/video.mp4.meta (100%) rename src/moin/help/{en => help-en}/Home%2fsubitem.data (100%) rename src/moin/help/{en => help-en}/Home%2fsubitem.meta (100%) rename src/moin/help/{en => help-en}/Home.data (100%) rename src/moin/help/{en => help-en}/Home.meta (100%) rename src/moin/help/{en => help-en}/InclusionForMoinWikiMacros.data (100%) rename src/moin/help/{en => help-en}/InclusionForMoinWikiMacros.meta (100%) rename src/moin/help/{en => help-en}/MoinWikiMacros%2fIcons.data (100%) rename src/moin/help/{en => help-en}/MoinWikiMacros%2fIcons.meta (100%) rename src/moin/help/{en => help-en}/MoinWikiMacros%2fMonthCalendar.data (100%) rename src/moin/help/{en => help-en}/MoinWikiMacros%2fMonthCalendar.meta (100%) rename src/moin/help/{en => help-en}/MoinWikiMacros.data (100%) rename src/moin/help/{en => help-en}/MoinWikiMacros.meta (100%) rename src/moin/help/{en => help-en}/OtherTextItems%2fCSV.data (100%) rename src/moin/help/{en => help-en}/OtherTextItems%2fCSV.meta (100%) rename src/moin/help/{en => help-en}/OtherTextItems%2fDiff.data (100%) rename src/moin/help/{en => help-en}/OtherTextItems%2fDiff.meta (100%) rename src/moin/help/{en => help-en}/OtherTextItems%2fIRC.data (100%) rename src/moin/help/{en => help-en}/OtherTextItems%2fIRC.meta (100%) rename src/moin/help/{en => help-en}/OtherTextItems%2fPlainText.data (100%) rename src/moin/help/{en => help-en}/OtherTextItems%2fPlainText.meta (100%) rename src/moin/help/{en => help-en}/OtherTextItems%2fPython.data (100%) rename src/moin/help/{en => help-en}/OtherTextItems%2fPython.meta (100%) rename src/moin/help/{en => help-en}/OtherTextItems.data (100%) rename src/moin/help/{en => help-en}/OtherTextItems.meta (100%) rename src/moin/help/{en => help-en}/Sibling.data (100%) rename src/moin/help/{en => help-en}/Sibling.meta (100%) rename src/moin/help/{en => help-en}/TemplateSample.data (100%) rename src/moin/help/{en => help-en}/TemplateSample.meta (100%) rename src/moin/help/{en => help-en}/WikiDict.data (100%) rename src/moin/help/{en => help-en}/WikiDict.meta (100%) rename src/moin/help/{en => help-en}/creole%2fsubitem.data (100%) rename src/moin/help/{en => help-en}/creole%2fsubitem.meta (100%) rename src/moin/help/{en => help-en}/creole.data (100%) rename src/moin/help/{en => help-en}/creole.meta (100%) rename src/moin/help/{en => help-en}/docbook%2fSubItem.data (100%) rename src/moin/help/{en => help-en}/docbook%2fSubItem.meta (100%) rename src/moin/help/{en => help-en}/docbook.data (100%) rename src/moin/help/{en => help-en}/docbook.meta (100%) rename src/moin/help/{en => help-en}/html%2fSubItem.data (100%) rename src/moin/help/{en => help-en}/html%2fSubItem.meta (100%) rename src/moin/help/{en => help-en}/html.data (100%) rename src/moin/help/{en => help-en}/html.meta (100%) rename src/moin/help/{en => help-en}/images.data (100%) rename src/moin/help/{en => help-en}/images.meta (100%) rename src/moin/help/{en => help-en}/markdown%2fSubitem.data (100%) rename src/moin/help/{en => help-en}/markdown%2fSubitem.meta (100%) rename src/moin/help/{en => help-en}/markdown.data (100%) rename src/moin/help/{en => help-en}/markdown.meta (100%) rename src/moin/help/{en => help-en}/mediawiki.data (100%) rename src/moin/help/{en => help-en}/mediawiki.meta (100%) rename src/moin/help/{en => help-en}/moin%2fHighlighterList.data (100%) rename src/moin/help/{en => help-en}/moin%2fHighlighterList.meta (100%) rename src/moin/help/{en => help-en}/moin%2fsubitem.data (100%) rename src/moin/help/{en => help-en}/moin%2fsubitem.meta (100%) rename src/moin/help/{en => help-en}/moin.data (100%) rename src/moin/help/{en => help-en}/moin.meta (100%) rename src/moin/help/{en => help-en}/rst%2fsubitem.data (100%) rename src/moin/help/{en => help-en}/rst%2fsubitem.meta (100%) rename src/moin/help/{en => help-en}/rst.data (100%) rename src/moin/help/{en => help-en}/rst.meta (100%) diff --git a/docs/admin/install.rst b/docs/admin/install.rst index d42530f18..e17f6f4fa 100644 --- a/docs/admin/install.rst +++ b/docs/admin/install.rst @@ -93,8 +93,8 @@ If you want to load English help for editors (replace en with your wiki's prefer :: - moin load-help -n en - moin load-help -n common + moin load-help -n help-en + moin load-help -n help-common Run your wiki instance ====================== @@ -223,8 +223,8 @@ If you want to load English help for editors (replace en with your wiki's prefer :: - moin load-help -n en - moin load-help -n common + moin load-help -n help-en + moin load-help -n help-common Next, run the built-in wiki server: diff --git a/docs/devel/development.rst b/docs/devel/development.rst index b511f9248..7662a76db 100644 --- a/docs/devel/development.rst +++ b/docs/devel/development.rst @@ -499,8 +499,8 @@ Wiki admins can change permissions via the ACL rules. To load the help docs:: - moin load-help --namespace common # images common to all languages - moin load-help --namespace en # English text + moin load-help --namespace help-common # images common to all languages + moin load-help --namespace help-en # English text Multiple languages may be loaded. Current languages include:: @@ -517,7 +517,7 @@ When editing is complete run one or more of:: Dump all the English help files to the version controlled directory:: - moin dump-help -n en + moin dump-help -n help-en The above command may may be useful after updating one or more files. All of the files will be rewritten but only the changed files will be highlighted in version control. @@ -574,7 +574,7 @@ Create a new venv, install moin, create instance, start server, create item, mod moin run # empty wiki moin load-sample # data but no index moin index-build # data with index - moin load-help -n en # load English help - moin load-help -n common # load help images + moin load-help -n help-en # load English help + moin load-help -n help-common # load help images Announce update on #moin, moin-devel@python.org. diff --git a/src/moin/cli/_tests/conftest.py b/src/moin/cli/_tests/conftest.py index 58fcdad99..116e919b0 100644 --- a/src/moin/cli/_tests/conftest.py +++ b/src/moin/cli/_tests/conftest.py @@ -1,4 +1,4 @@ -# Copyright: 2023 MoinMoin project +# Copyright: 2023-2024 MoinMoin project # License: GNU GPL v2 (or any later version), see LICENSE.txt for details. """ @@ -78,8 +78,8 @@ def index_create(create_instance): @pytest.fixture(scope="package") def load_help(index_create): - load_help_common = run(['moin', 'load-help', '-n', 'common']) - load_help_en = run(['moin', 'load-help', '-n', 'en']) + load_help_common = run(['moin', 'load-help', '-n', 'help-common']) + load_help_en = run(['moin', 'load-help', '-n', 'help-en']) return load_help_common, load_help_en diff --git a/src/moin/cli/_tests/test_modify_item.py b/src/moin/cli/_tests/test_modify_item.py index 0114927da..d9aaf2684 100644 --- a/src/moin/cli/_tests/test_modify_item.py +++ b/src/moin/cli/_tests/test_modify_item.py @@ -1,4 +1,4 @@ -# Copyright: 2023 MoinMoin project +# Copyright: 2023-2024 MoinMoin project # License: GNU GPL v2 (or any later version), see LICENSE.txt for details. """ @@ -40,9 +40,9 @@ def test_dump_help(load_help): moin_dir, artifact_dir = get_dirs('cli') help_dir = Path('my_help') source_help_dir = moin_dir / 'src' / 'moin' / 'help' - with open(source_help_dir / 'en' / 'Home.data', newline='') as f: + with open(source_help_dir / 'help-en' / 'Home.data', newline='') as f: crlf_option = '--crlf' if '\r\n' in f.read() else '--no-crlf' - for help_subdir in ['common', 'en']: + for help_subdir in ['help-common', 'help-en']: help_subdir_path = help_dir / help_subdir if not help_subdir_path.exists(): help_subdir_path.mkdir(parents=True) @@ -75,12 +75,12 @@ def test_item_get(load_help): moin_dir, _ = get_dirs('cli') with open('cat.meta') as f: meta_cat = json.load(f) - with open(moin_dir / 'src' / 'moin' / 'help' / 'common' / 'cat.jpg.meta') as f: + with open(moin_dir / 'src' / 'moin' / 'help' / 'help-common' / 'cat.jpg.meta') as f: meta_cat_expected = json.load(f) - validate_meta(meta_cat_expected, meta_cat, f"{moin_dir / 'src' / 'moin' / 'help' / 'common' / 'cat.jpg.meta'} != cat.meta") + validate_meta(meta_cat_expected, meta_cat, f"{moin_dir / 'src' / 'moin' / 'help' / 'help-common' / 'cat.jpg.meta'} != cat.meta") with open('cat.data', 'rb') as f: cat_bytes = f.read() - with open(moin_dir / 'src' / 'moin' / 'help' / 'common' / 'cat.jpg.data', 'rb') as f: + with open(moin_dir / 'src' / 'moin' / 'help' / 'help-common' / 'cat.jpg.data', 'rb') as f: cat_bytes_expected = f.read() assert cat_bytes_expected == cat_bytes diff --git a/src/moin/cli/maint/create_instance.py b/src/moin/cli/maint/create_instance.py index 07fa14dfd..406d56896 100644 --- a/src/moin/cli/maint/create_instance.py +++ b/src/moin/cli/maint/create_instance.py @@ -1,5 +1,5 @@ # Copyright: 2020 MoinMoin:RogerHaase -# Copyright: 2023 MoinMoin project +# Copyright: 2023-2024 MoinMoin project # License: GNU GPL v2 (or any later version), see LICENSE.txt for details. """ @@ -100,8 +100,8 @@ def cli_BuildInstance(): logging.info('Build Instance started.') logging.debug('CWD: %s', os.getcwd()) index.IndexCreate() - modify_item.LoadHelp(namespace='en', path_to_help=None) - modify_item.LoadHelp(namespace='common', path_to_help=None) + modify_item.LoadHelp(namespace='help-en', path_to_help=None) + modify_item.LoadHelp(namespace='help-common', path_to_help=None) modify_item.LoadWelcome() index.IndexOptimize(tmp=False) logging.info('Full instance setup finished.') diff --git a/src/moin/cli/maint/modify_item.py b/src/moin/cli/maint/modify_item.py index 992a7bafc..5ee8f4618 100644 --- a/src/moin/cli/maint/modify_item.py +++ b/src/moin/cli/maint/modify_item.py @@ -1,6 +1,6 @@ # Copyright: 2011 MoinMoin:ThomasWaldmann # Copyright: 2022 MoinMoin:RogerHaase -# Copyright: 2023 MoinMoin project +# Copyright: 2023-2024 MoinMoin project # License: GNU GPL v2 (or any later version), see LICENSE.txt for details. """ @@ -152,7 +152,7 @@ def PutItem(meta_file, data_file, overwrite): @cli.command('load-help', help='Load a directory of help .data and .meta file pairs into a wiki namespace') @click.option('--namespace', '-n', type=str, required=True, - help='Namespace to be loaded: common, en, etc.') + help='Namespace to be loaded: help-common, help-en, etc.') @click.option('--path_to_help', '--path', '-p', type=str, help='Override source directory, default is src/moin/help') def cli_LoadHelp(namespace, path_to_help): @@ -190,7 +190,7 @@ def LoadHelp(namespace, path_to_help): @cli.command('dump-help', help='Dump a namespace of user help items to .data and .meta file pairs') @click.option('--namespace', '-n', type=str, required=True, - help='Namespace to be dumped: common, en, etc.') + help='Namespace to be dumped: help-common, help-en, etc.') @click.option('--path_to_help', '--path', '-p', type=str, help='Override output directory, default is src/moin/help') @click.option('--crlf/--no-crlf', help='use windows line endings in output files') @@ -203,9 +203,8 @@ def DumpHelp(namespace, path_to_help, crlf): before_wiki() if path_to_help is None: path_to_help = _get_path_to_help() - item_name = 'help-' + namespace - # item_name is a namespace, we create a dummy item so we can get a list of files - item = Item.create(item_name) + # Item name is the name of the namespace, create a dummy item to get the list of files + item = Item.create(namespace) # get_index is fast, but returns alias names as if they are unique items _, files = item.get_index() count = 0 diff --git a/src/moin/help/common/archive.tar.gz.data b/src/moin/help/help-common/archive.tar.gz.data similarity index 100% rename from src/moin/help/common/archive.tar.gz.data rename to src/moin/help/help-common/archive.tar.gz.data diff --git a/src/moin/help/common/archive.tar.gz.meta b/src/moin/help/help-common/archive.tar.gz.meta similarity index 100% rename from src/moin/help/common/archive.tar.gz.meta rename to src/moin/help/help-common/archive.tar.gz.meta diff --git a/src/moin/help/common/archive.zip.data b/src/moin/help/help-common/archive.zip.data similarity index 100% rename from src/moin/help/common/archive.zip.data rename to src/moin/help/help-common/archive.zip.data diff --git a/src/moin/help/common/archive.zip.meta b/src/moin/help/help-common/archive.zip.meta similarity index 100% rename from src/moin/help/common/archive.zip.meta rename to src/moin/help/help-common/archive.zip.meta diff --git a/src/moin/help/common/audio.mp3.data b/src/moin/help/help-common/audio.mp3.data similarity index 100% rename from src/moin/help/common/audio.mp3.data rename to src/moin/help/help-common/audio.mp3.data diff --git a/src/moin/help/common/audio.mp3.meta b/src/moin/help/help-common/audio.mp3.meta similarity index 100% rename from src/moin/help/common/audio.mp3.meta rename to src/moin/help/help-common/audio.mp3.meta diff --git a/src/moin/help/common/cat.jpg.data b/src/moin/help/help-common/cat.jpg.data similarity index 100% rename from src/moin/help/common/cat.jpg.data rename to src/moin/help/help-common/cat.jpg.data diff --git a/src/moin/help/common/cat.jpg.meta b/src/moin/help/help-common/cat.jpg.meta similarity index 100% rename from src/moin/help/common/cat.jpg.meta rename to src/moin/help/help-common/cat.jpg.meta diff --git a/src/moin/help/common/logo.png.data b/src/moin/help/help-common/logo.png.data similarity index 100% rename from src/moin/help/common/logo.png.data rename to src/moin/help/help-common/logo.png.data diff --git a/src/moin/help/common/logo.png.meta b/src/moin/help/help-common/logo.png.meta similarity index 100% rename from src/moin/help/common/logo.png.meta rename to src/moin/help/help-common/logo.png.meta diff --git a/src/moin/help/common/logo.svg.data b/src/moin/help/help-common/logo.svg.data similarity index 100% rename from src/moin/help/common/logo.svg.data rename to src/moin/help/help-common/logo.svg.data diff --git a/src/moin/help/common/logo.svg.meta b/src/moin/help/help-common/logo.svg.meta similarity index 100% rename from src/moin/help/common/logo.svg.meta rename to src/moin/help/help-common/logo.svg.meta diff --git a/src/moin/help/common/video.mp4.data b/src/moin/help/help-common/video.mp4.data similarity index 100% rename from src/moin/help/common/video.mp4.data rename to src/moin/help/help-common/video.mp4.data diff --git a/src/moin/help/common/video.mp4.meta b/src/moin/help/help-common/video.mp4.meta similarity index 100% rename from src/moin/help/common/video.mp4.meta rename to src/moin/help/help-common/video.mp4.meta diff --git a/src/moin/help/en/Home%2fsubitem.data b/src/moin/help/help-en/Home%2fsubitem.data similarity index 100% rename from src/moin/help/en/Home%2fsubitem.data rename to src/moin/help/help-en/Home%2fsubitem.data diff --git a/src/moin/help/en/Home%2fsubitem.meta b/src/moin/help/help-en/Home%2fsubitem.meta similarity index 100% rename from src/moin/help/en/Home%2fsubitem.meta rename to src/moin/help/help-en/Home%2fsubitem.meta diff --git a/src/moin/help/en/Home.data b/src/moin/help/help-en/Home.data similarity index 100% rename from src/moin/help/en/Home.data rename to src/moin/help/help-en/Home.data diff --git a/src/moin/help/en/Home.meta b/src/moin/help/help-en/Home.meta similarity index 100% rename from src/moin/help/en/Home.meta rename to src/moin/help/help-en/Home.meta diff --git a/src/moin/help/en/InclusionForMoinWikiMacros.data b/src/moin/help/help-en/InclusionForMoinWikiMacros.data similarity index 100% rename from src/moin/help/en/InclusionForMoinWikiMacros.data rename to src/moin/help/help-en/InclusionForMoinWikiMacros.data diff --git a/src/moin/help/en/InclusionForMoinWikiMacros.meta b/src/moin/help/help-en/InclusionForMoinWikiMacros.meta similarity index 100% rename from src/moin/help/en/InclusionForMoinWikiMacros.meta rename to src/moin/help/help-en/InclusionForMoinWikiMacros.meta diff --git a/src/moin/help/en/MoinWikiMacros%2fIcons.data b/src/moin/help/help-en/MoinWikiMacros%2fIcons.data similarity index 100% rename from src/moin/help/en/MoinWikiMacros%2fIcons.data rename to src/moin/help/help-en/MoinWikiMacros%2fIcons.data diff --git a/src/moin/help/en/MoinWikiMacros%2fIcons.meta b/src/moin/help/help-en/MoinWikiMacros%2fIcons.meta similarity index 100% rename from src/moin/help/en/MoinWikiMacros%2fIcons.meta rename to src/moin/help/help-en/MoinWikiMacros%2fIcons.meta diff --git a/src/moin/help/en/MoinWikiMacros%2fMonthCalendar.data b/src/moin/help/help-en/MoinWikiMacros%2fMonthCalendar.data similarity index 100% rename from src/moin/help/en/MoinWikiMacros%2fMonthCalendar.data rename to src/moin/help/help-en/MoinWikiMacros%2fMonthCalendar.data diff --git a/src/moin/help/en/MoinWikiMacros%2fMonthCalendar.meta b/src/moin/help/help-en/MoinWikiMacros%2fMonthCalendar.meta similarity index 100% rename from src/moin/help/en/MoinWikiMacros%2fMonthCalendar.meta rename to src/moin/help/help-en/MoinWikiMacros%2fMonthCalendar.meta diff --git a/src/moin/help/en/MoinWikiMacros.data b/src/moin/help/help-en/MoinWikiMacros.data similarity index 100% rename from src/moin/help/en/MoinWikiMacros.data rename to src/moin/help/help-en/MoinWikiMacros.data diff --git a/src/moin/help/en/MoinWikiMacros.meta b/src/moin/help/help-en/MoinWikiMacros.meta similarity index 100% rename from src/moin/help/en/MoinWikiMacros.meta rename to src/moin/help/help-en/MoinWikiMacros.meta diff --git a/src/moin/help/en/OtherTextItems%2fCSV.data b/src/moin/help/help-en/OtherTextItems%2fCSV.data similarity index 100% rename from src/moin/help/en/OtherTextItems%2fCSV.data rename to src/moin/help/help-en/OtherTextItems%2fCSV.data diff --git a/src/moin/help/en/OtherTextItems%2fCSV.meta b/src/moin/help/help-en/OtherTextItems%2fCSV.meta similarity index 100% rename from src/moin/help/en/OtherTextItems%2fCSV.meta rename to src/moin/help/help-en/OtherTextItems%2fCSV.meta diff --git a/src/moin/help/en/OtherTextItems%2fDiff.data b/src/moin/help/help-en/OtherTextItems%2fDiff.data similarity index 100% rename from src/moin/help/en/OtherTextItems%2fDiff.data rename to src/moin/help/help-en/OtherTextItems%2fDiff.data diff --git a/src/moin/help/en/OtherTextItems%2fDiff.meta b/src/moin/help/help-en/OtherTextItems%2fDiff.meta similarity index 100% rename from src/moin/help/en/OtherTextItems%2fDiff.meta rename to src/moin/help/help-en/OtherTextItems%2fDiff.meta diff --git a/src/moin/help/en/OtherTextItems%2fIRC.data b/src/moin/help/help-en/OtherTextItems%2fIRC.data similarity index 100% rename from src/moin/help/en/OtherTextItems%2fIRC.data rename to src/moin/help/help-en/OtherTextItems%2fIRC.data diff --git a/src/moin/help/en/OtherTextItems%2fIRC.meta b/src/moin/help/help-en/OtherTextItems%2fIRC.meta similarity index 100% rename from src/moin/help/en/OtherTextItems%2fIRC.meta rename to src/moin/help/help-en/OtherTextItems%2fIRC.meta diff --git a/src/moin/help/en/OtherTextItems%2fPlainText.data b/src/moin/help/help-en/OtherTextItems%2fPlainText.data similarity index 100% rename from src/moin/help/en/OtherTextItems%2fPlainText.data rename to src/moin/help/help-en/OtherTextItems%2fPlainText.data diff --git a/src/moin/help/en/OtherTextItems%2fPlainText.meta b/src/moin/help/help-en/OtherTextItems%2fPlainText.meta similarity index 100% rename from src/moin/help/en/OtherTextItems%2fPlainText.meta rename to src/moin/help/help-en/OtherTextItems%2fPlainText.meta diff --git a/src/moin/help/en/OtherTextItems%2fPython.data b/src/moin/help/help-en/OtherTextItems%2fPython.data similarity index 100% rename from src/moin/help/en/OtherTextItems%2fPython.data rename to src/moin/help/help-en/OtherTextItems%2fPython.data diff --git a/src/moin/help/en/OtherTextItems%2fPython.meta b/src/moin/help/help-en/OtherTextItems%2fPython.meta similarity index 100% rename from src/moin/help/en/OtherTextItems%2fPython.meta rename to src/moin/help/help-en/OtherTextItems%2fPython.meta diff --git a/src/moin/help/en/OtherTextItems.data b/src/moin/help/help-en/OtherTextItems.data similarity index 100% rename from src/moin/help/en/OtherTextItems.data rename to src/moin/help/help-en/OtherTextItems.data diff --git a/src/moin/help/en/OtherTextItems.meta b/src/moin/help/help-en/OtherTextItems.meta similarity index 100% rename from src/moin/help/en/OtherTextItems.meta rename to src/moin/help/help-en/OtherTextItems.meta diff --git a/src/moin/help/en/Sibling.data b/src/moin/help/help-en/Sibling.data similarity index 100% rename from src/moin/help/en/Sibling.data rename to src/moin/help/help-en/Sibling.data diff --git a/src/moin/help/en/Sibling.meta b/src/moin/help/help-en/Sibling.meta similarity index 100% rename from src/moin/help/en/Sibling.meta rename to src/moin/help/help-en/Sibling.meta diff --git a/src/moin/help/en/TemplateSample.data b/src/moin/help/help-en/TemplateSample.data similarity index 100% rename from src/moin/help/en/TemplateSample.data rename to src/moin/help/help-en/TemplateSample.data diff --git a/src/moin/help/en/TemplateSample.meta b/src/moin/help/help-en/TemplateSample.meta similarity index 100% rename from src/moin/help/en/TemplateSample.meta rename to src/moin/help/help-en/TemplateSample.meta diff --git a/src/moin/help/en/WikiDict.data b/src/moin/help/help-en/WikiDict.data similarity index 100% rename from src/moin/help/en/WikiDict.data rename to src/moin/help/help-en/WikiDict.data diff --git a/src/moin/help/en/WikiDict.meta b/src/moin/help/help-en/WikiDict.meta similarity index 100% rename from src/moin/help/en/WikiDict.meta rename to src/moin/help/help-en/WikiDict.meta diff --git a/src/moin/help/en/creole%2fsubitem.data b/src/moin/help/help-en/creole%2fsubitem.data similarity index 100% rename from src/moin/help/en/creole%2fsubitem.data rename to src/moin/help/help-en/creole%2fsubitem.data diff --git a/src/moin/help/en/creole%2fsubitem.meta b/src/moin/help/help-en/creole%2fsubitem.meta similarity index 100% rename from src/moin/help/en/creole%2fsubitem.meta rename to src/moin/help/help-en/creole%2fsubitem.meta diff --git a/src/moin/help/en/creole.data b/src/moin/help/help-en/creole.data similarity index 100% rename from src/moin/help/en/creole.data rename to src/moin/help/help-en/creole.data diff --git a/src/moin/help/en/creole.meta b/src/moin/help/help-en/creole.meta similarity index 100% rename from src/moin/help/en/creole.meta rename to src/moin/help/help-en/creole.meta diff --git a/src/moin/help/en/docbook%2fSubItem.data b/src/moin/help/help-en/docbook%2fSubItem.data similarity index 100% rename from src/moin/help/en/docbook%2fSubItem.data rename to src/moin/help/help-en/docbook%2fSubItem.data diff --git a/src/moin/help/en/docbook%2fSubItem.meta b/src/moin/help/help-en/docbook%2fSubItem.meta similarity index 100% rename from src/moin/help/en/docbook%2fSubItem.meta rename to src/moin/help/help-en/docbook%2fSubItem.meta diff --git a/src/moin/help/en/docbook.data b/src/moin/help/help-en/docbook.data similarity index 100% rename from src/moin/help/en/docbook.data rename to src/moin/help/help-en/docbook.data diff --git a/src/moin/help/en/docbook.meta b/src/moin/help/help-en/docbook.meta similarity index 100% rename from src/moin/help/en/docbook.meta rename to src/moin/help/help-en/docbook.meta diff --git a/src/moin/help/en/html%2fSubItem.data b/src/moin/help/help-en/html%2fSubItem.data similarity index 100% rename from src/moin/help/en/html%2fSubItem.data rename to src/moin/help/help-en/html%2fSubItem.data diff --git a/src/moin/help/en/html%2fSubItem.meta b/src/moin/help/help-en/html%2fSubItem.meta similarity index 100% rename from src/moin/help/en/html%2fSubItem.meta rename to src/moin/help/help-en/html%2fSubItem.meta diff --git a/src/moin/help/en/html.data b/src/moin/help/help-en/html.data similarity index 100% rename from src/moin/help/en/html.data rename to src/moin/help/help-en/html.data diff --git a/src/moin/help/en/html.meta b/src/moin/help/help-en/html.meta similarity index 100% rename from src/moin/help/en/html.meta rename to src/moin/help/help-en/html.meta diff --git a/src/moin/help/en/images.data b/src/moin/help/help-en/images.data similarity index 100% rename from src/moin/help/en/images.data rename to src/moin/help/help-en/images.data diff --git a/src/moin/help/en/images.meta b/src/moin/help/help-en/images.meta similarity index 100% rename from src/moin/help/en/images.meta rename to src/moin/help/help-en/images.meta diff --git a/src/moin/help/en/markdown%2fSubitem.data b/src/moin/help/help-en/markdown%2fSubitem.data similarity index 100% rename from src/moin/help/en/markdown%2fSubitem.data rename to src/moin/help/help-en/markdown%2fSubitem.data diff --git a/src/moin/help/en/markdown%2fSubitem.meta b/src/moin/help/help-en/markdown%2fSubitem.meta similarity index 100% rename from src/moin/help/en/markdown%2fSubitem.meta rename to src/moin/help/help-en/markdown%2fSubitem.meta diff --git a/src/moin/help/en/markdown.data b/src/moin/help/help-en/markdown.data similarity index 100% rename from src/moin/help/en/markdown.data rename to src/moin/help/help-en/markdown.data diff --git a/src/moin/help/en/markdown.meta b/src/moin/help/help-en/markdown.meta similarity index 100% rename from src/moin/help/en/markdown.meta rename to src/moin/help/help-en/markdown.meta diff --git a/src/moin/help/en/mediawiki.data b/src/moin/help/help-en/mediawiki.data similarity index 100% rename from src/moin/help/en/mediawiki.data rename to src/moin/help/help-en/mediawiki.data diff --git a/src/moin/help/en/mediawiki.meta b/src/moin/help/help-en/mediawiki.meta similarity index 100% rename from src/moin/help/en/mediawiki.meta rename to src/moin/help/help-en/mediawiki.meta diff --git a/src/moin/help/en/moin%2fHighlighterList.data b/src/moin/help/help-en/moin%2fHighlighterList.data similarity index 100% rename from src/moin/help/en/moin%2fHighlighterList.data rename to src/moin/help/help-en/moin%2fHighlighterList.data diff --git a/src/moin/help/en/moin%2fHighlighterList.meta b/src/moin/help/help-en/moin%2fHighlighterList.meta similarity index 100% rename from src/moin/help/en/moin%2fHighlighterList.meta rename to src/moin/help/help-en/moin%2fHighlighterList.meta diff --git a/src/moin/help/en/moin%2fsubitem.data b/src/moin/help/help-en/moin%2fsubitem.data similarity index 100% rename from src/moin/help/en/moin%2fsubitem.data rename to src/moin/help/help-en/moin%2fsubitem.data diff --git a/src/moin/help/en/moin%2fsubitem.meta b/src/moin/help/help-en/moin%2fsubitem.meta similarity index 100% rename from src/moin/help/en/moin%2fsubitem.meta rename to src/moin/help/help-en/moin%2fsubitem.meta diff --git a/src/moin/help/en/moin.data b/src/moin/help/help-en/moin.data similarity index 100% rename from src/moin/help/en/moin.data rename to src/moin/help/help-en/moin.data diff --git a/src/moin/help/en/moin.meta b/src/moin/help/help-en/moin.meta similarity index 100% rename from src/moin/help/en/moin.meta rename to src/moin/help/help-en/moin.meta diff --git a/src/moin/help/en/rst%2fsubitem.data b/src/moin/help/help-en/rst%2fsubitem.data similarity index 100% rename from src/moin/help/en/rst%2fsubitem.data rename to src/moin/help/help-en/rst%2fsubitem.data diff --git a/src/moin/help/en/rst%2fsubitem.meta b/src/moin/help/help-en/rst%2fsubitem.meta similarity index 100% rename from src/moin/help/en/rst%2fsubitem.meta rename to src/moin/help/help-en/rst%2fsubitem.meta diff --git a/src/moin/help/en/rst.data b/src/moin/help/help-en/rst.data similarity index 100% rename from src/moin/help/en/rst.data rename to src/moin/help/help-en/rst.data diff --git a/src/moin/help/en/rst.meta b/src/moin/help/help-en/rst.meta similarity index 100% rename from src/moin/help/en/rst.meta rename to src/moin/help/help-en/rst.meta