Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Convert to alias #515

Merged
merged 10 commits into from
Feb 17, 2022
Merged

Convert to alias #515

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
82e1930
Add new page action to convert back to alias
zerolab Feb 7, 2022
4577bd5
Add the convert to alias action in localize react interface
zerolab Feb 7, 2022
1ffbd36
Improve logic for showing ConvertToAliasPageActionMenuItem
zerolab Feb 7, 2022
05f9559
Simplify convert_to_alias view checks
zerolab Feb 7, 2022
3019285
Add new log action and log the conversion
zerolab Feb 7, 2022
d0be4b5
Add icon for the convert action
zerolab Feb 7, 2022
25ffc81
Add tests
zerolab Feb 7, 2022
4ae0511
Fix `register_log_actions` declaration for Wagtail < 2.15
zerolab Feb 7, 2022
acad31d
Tidy up based on code review
zerolab Feb 10, 2022
ae28a5b
Sync with source page when converting back to alias
zerolab Feb 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions wagtail_localize/static_src/editor/components/TranslationEditor/footer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,19 +33,23 @@ const EditorFooter: FunctionComponent<EditorProps> = ({
if (links.convertToAliasUrl) {
actions.push(
<form method="GET" action={links.convertToAliasUrl}>
<input type="hidden" name="csrfmiddlewaretoken" value={csrfToken}/>
<input type="hidden" name="next" value={window.location.href}/>
<input
type="hidden"
name="csrfmiddlewaretoken"
value={csrfToken}
/>
zerolab marked this conversation as resolved.
Show resolved Hide resolved
<input type="hidden" name="next" value={window.location.href} />

<button
type="submit"
className="button action-secondary"
aria-label={gettext('Convert to alias page')}
>
<Icon name="undo"/>
<Icon name="wagtail-localize-convert" />
{gettext('Convert to alias page')}
</button>
</form>
)
);
}

if (perms.canDelete) {
Expand Down
2 changes: 2 additions & 0 deletions wagtail_localize/templates/wagtail_localize/icons/convert.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 7 additions & 1 deletion wagtail_localize/wagtail_hooks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ def register_restart_translation_page_action_menu_item():
class ConvertToAliasPageActionMenuItem(PageActionMenuItem):
label = gettext_lazy("Convert to alias page")
name = "localize-convert-to-alias"
icon_name = "undo"
icon_name = "wagtail-localize-convert"
classname = "action-secondary"

def _is_shown(self, context):
Expand Down Expand Up @@ -434,3 +434,9 @@ def format_message(self, log_entry):
}
except KeyError:
return _("Converted page to an alias of the translation source page")


@hooks.register("register_icons")
def register_icons(icons):
# icon id "wagtail-localize-convert" (which translates to `.icon-wagtail-localize-convert`)
return icons + ["wagtail_localize/icons/convert.svg"]