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

String extractions and extraction fixes #4066

Merged
merged 3 commits into from
May 11, 2023
Merged

String extractions and extraction fixes #4066

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
04ab11e
String extractions and extraction fixes
bjester May 9, 2023
49544d3
Ignore some backend strings for translation
bjester May 10, 2023
a3e1e11
Additional extraction fixes and extraction after audit
bjester May 11, 2023
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
10 changes: 4 additions & 6 deletions contentcuration/contentcuration/constants/channel_history.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
from django.utils.translation import ugettext_lazy as _

CREATION = "creation"
PUBLICATION = "publication"
DELETION = "deletion"
RECOVERY = "recovery"

choices = (
(CREATION, _("Creation")),
(PUBLICATION, _("Publication")),
(DELETION, _("Deletion")),
(RECOVERY, _("Deletion recovery")),
(CREATION, "Creation"),
(PUBLICATION, "Publication"),
(DELETION, "Deletion"),
(RECOVERY, "Deletion recovery"),
)
8 changes: 3 additions & 5 deletions contentcuration/contentcuration/constants/user_history.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
from django.utils.translation import ugettext_lazy as _

DELETION = "soft-deletion"
RECOVERY = "soft-recovery"
RELATED_DATA_HARD_DELETION = "related-data-hard-deletion"

choices = (
(DELETION, _("User soft deletion")),
(RECOVERY, _("User soft deletion recovery")),
(RELATED_DATA_HARD_DELETION, _("User related data hard deletion")),
(DELETION, "User soft deletion"),
(RECOVERY, "User soft deletion recovery"),
(RELATED_DATA_HARD_DELETION, "User related data hard deletion"),
)
4 changes: 0 additions & 4 deletions contentcuration/contentcuration/frontend/shared/mixins.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,6 @@ const statusStrings = createTranslator('StatusStrings', {
noStorageError: 'Not enough space',
});

export const validationStrings = createTranslator('ValidationStrings', {
message: 'Required information is missing',
});

export const fileStatusMixin = {
mixins: [fileSizeMixin],
computed: {
Expand Down
10 changes: 9 additions & 1 deletion contentcuration/contentcuration/frontend/shared/views/errors/AppError.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<template functional>
<template>

<VLayout
align-center
Expand All @@ -21,6 +21,14 @@

</template>

<script>

export default {
name: 'AppError',
};

</script>


<style lang="less" scoped>

Expand Down
Loading