Unified Diff: cms/utils.py
Issue 29933596:
Issue 5333 - Allow cms to generate relative pages (Closed)
Base URL: https://hg.adblockplus.org/cms/
Patch Set: Translate rel_path
Created Nov. 8, 2018, 2:48 a.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« cms/converters.py ('K')
|
« cms/converters.py ('k')
|
tests/expected_output/common/de/translate-partial » ('j')
|
tests/expected_output/relative/en/foo/bar » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: cms/utils.py |
| =================================================================== |
| --- a/cms/utils.py |
| +++ b/cms/utils.py |
| @@ -126,7 +126,7 @@ |
| def get_page_params(source, locale, page, format=None, site_url_override=None, |
| - localized_string_callback=None): |
| + localized_string_callback=None, relative=None): |
| from cms.converters import converters |
| # Guess page format if omitted, but default to Markdown for friendlier exceptions |
| @@ -144,6 +144,7 @@ |
| 'page': page, |
| 'config': source.read_config(), |
| 'localized_string_callback': localized_string_callback, |
| + 'relative': relative, |
| } |
| params['localedata'] = source.read_locale(params['locale'], page) |
| @@ -190,9 +191,10 @@ |
| def process_page(source, locale, page, format=None, site_url_override=None, |
| - localized_string_callback=None): |
| + localized_string_callback=None, relative=False): |
| from cms.converters import TemplateConverter |
| params = get_page_params(source, locale, page, format, site_url_override, |
| localized_string_callback) |
| + params['relative'] = relative |
| return TemplateConverter(*params['templatedata'], params=params)() |
« cms/converters.py ('K')
|
« cms/converters.py ('k')
|
tests/expected_output/common/de/translate-partial » ('j')
|
tests/expected_output/relative/en/foo/bar » ('J')
