From fa38a41e42dbbbd5aa9d1aa2efb107d99ce8cd7d Mon Sep 17 00:00:00 2001 From: Shpuld Shpludson Date: Mon, 2 Dec 2019 12:20:24 +0000 Subject: fix "can't find property of undefined" errors in mrf transparency panel --- src/components/mrf_transparency_panel/mrf_transparency_panel.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/components/mrf_transparency_panel/mrf_transparency_panel.vue') diff --git a/src/components/mrf_transparency_panel/mrf_transparency_panel.vue b/src/components/mrf_transparency_panel/mrf_transparency_panel.vue index 2640d68c..d6495dc6 100644 --- a/src/components/mrf_transparency_panel/mrf_transparency_panel.vue +++ b/src/components/mrf_transparency_panel/mrf_transparency_panel.vue @@ -22,7 +22,9 @@ /> -

{{ $t("about.mrf_policy_simple") }}

+

+ {{ $t("about.mrf_policy_simple") }} +

{{ $t("about.mrf_policy_simple_accept") }}

-- cgit v1.2.3-70-g09d2 From dafced3a864c80f69316417082aaa08e10adee49 Mon Sep 17 00:00:00 2001 From: Hakaba Hitoyo Date: Mon, 10 Feb 2020 08:04:58 +0000 Subject: MRF Keyword Policy Disclosure --- CHANGELOG.md | 1 + .../mrf_transparency_panel.js | 10 ++++- .../mrf_transparency_panel.vue | 43 ++++++++++++++++++++++ src/i18n/en.json | 11 +++++- 4 files changed, 63 insertions(+), 2 deletions(-) (limited to 'src/components/mrf_transparency_panel/mrf_transparency_panel.vue') diff --git a/CHANGELOG.md b/CHANGELOG.md index abefd958..c011835c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Pleroma AMOLED dark theme - User level domain mutes, under User Settings -> Mutes - Emoji reactions for statuses +- MRF keyword policy disclosure ### Changed - Captcha now resets on failed registrations - Notifications column now cleans itself up to optimize performance when tab is left open for a long time diff --git a/src/components/mrf_transparency_panel/mrf_transparency_panel.js b/src/components/mrf_transparency_panel/mrf_transparency_panel.js index 6a1baec8..a0b600d2 100644 --- a/src/components/mrf_transparency_panel/mrf_transparency_panel.js +++ b/src/components/mrf_transparency_panel/mrf_transparency_panel.js @@ -11,7 +11,10 @@ const MRFTransparencyPanel = { rejectInstances: state => get(state, 'instance.federationPolicy.mrf_simple.reject', []), ftlRemovalInstances: state => get(state, 'instance.federationPolicy.mrf_simple.federated_timeline_removal', []), mediaNsfwInstances: state => get(state, 'instance.federationPolicy.mrf_simple.media_nsfw', []), - mediaRemovalInstances: state => get(state, 'instance.federationPolicy.mrf_simple.media_removal', []) + mediaRemovalInstances: state => get(state, 'instance.federationPolicy.mrf_simple.media_removal', []), + keywordsFtlRemoval: state => get(state, 'instance.federationPolicy.mrf_keyword.federated_timeline_removal', []), + keywordsReject: state => get(state, 'instance.federationPolicy.mrf_keyword.reject', []), + keywordsReplace: state => get(state, 'instance.federationPolicy.mrf_keyword.replace', []) }), hasInstanceSpecificPolicies () { return this.quarantineInstances.length || @@ -20,6 +23,11 @@ const MRFTransparencyPanel = { this.ftlRemovalInstances.length || this.mediaNsfwInstances.length || this.mediaRemovalInstances.length + }, + hasKeywordPolicies () { + return this.keywordsFtlRemoval.length || + this.keywordsReject.length || + this.keywordsReplace.length } } } diff --git a/src/components/mrf_transparency_panel/mrf_transparency_panel.vue b/src/components/mrf_transparency_panel/mrf_transparency_panel.vue index d6495dc6..8038e587 100644 --- a/src/components/mrf_transparency_panel/mrf_transparency_panel.vue +++ b/src/components/mrf_transparency_panel/mrf_transparency_panel.vue @@ -109,6 +109,49 @@ />
+ +

+ {{ $t("about.mrf.keyword.keyword_policies") }} +

+ +
+

{{ $t("about.mrf.keyword.ftl_removal") }}

+ + +
+ +
+

{{ $t("about.mrf.keyword.reject") }}

+ + +
+ +
+

{{ $t("about.mrf.keyword.replace") }}

+ + +
diff --git a/src/i18n/en.json b/src/i18n/en.json index db2ce54d..ef841bbb 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -16,7 +16,16 @@ "mrf_policy_simple_media_removal": "Media Removal", "mrf_policy_simple_media_removal_desc": "This instance removes media from posts on the following instances:", "mrf_policy_simple_media_nsfw": "Media Force-set As Sensitive", - "mrf_policy_simple_media_nsfw_desc": "This instance forces media to be set sensitive in posts on the following instances:" + "mrf_policy_simple_media_nsfw_desc": "This instance forces media to be set sensitive in posts on the following instances:", + "mrf": { + "keyword": { + "keyword_policies": "Keyword Policies", + "ftl_removal": "Removal from \"The Whole Known Network\" Timeline", + "reject": "Reject", + "replace": "Replace", + "is_replaced_by": "→" + } + } }, "chat": { "title": "Chat" -- cgit v1.2.3-70-g09d2 From 4aeba026e6166f7e8f44e8e33e4e84f687e9a642 Mon Sep 17 00:00:00 2001 From: Hakaba Hitoyo Date: Thu, 13 Feb 2020 09:43:56 +0000 Subject: Refactor i18n messages for MRF policy disclosure --- .../mrf_transparency_panel.vue | 32 +++++++++--------- src/i18n/en.json | 38 ++++++++++++---------- src/i18n/ja_easy.json | 38 ++++++++++++---------- 3 files changed, 57 insertions(+), 51 deletions(-) (limited to 'src/components/mrf_transparency_panel/mrf_transparency_panel.vue') diff --git a/src/components/mrf_transparency_panel/mrf_transparency_panel.vue b/src/components/mrf_transparency_panel/mrf_transparency_panel.vue index 8038e587..acdf822e 100644 --- a/src/components/mrf_transparency_panel/mrf_transparency_panel.vue +++ b/src/components/mrf_transparency_panel/mrf_transparency_panel.vue @@ -6,13 +6,13 @@
- {{ $t("about.federation") }} + {{ $t("about.mrf.federation") }}
-

{{ $t("about.mrf_policies") }}

-

{{ $t("about.mrf_policies_desc") }}

+

{{ $t("about.mrf.mrf_policies") }}

+

{{ $t("about.mrf.mrf_policies_desc") }}

  • - {{ $t("about.mrf_policy_simple") }} + {{ $t("about.mrf.simple.simple_policies") }}

    -

    {{ $t("about.mrf_policy_simple_accept") }}

    +

    {{ $t("about.mrf.simple.accept") }}

    -

    {{ $t("about.mrf_policy_simple_accept_desc") }}

    +

    {{ $t("about.mrf.simple.accept_desc") }}

    • -

      {{ $t("about.mrf_policy_simple_reject") }}

      +

      {{ $t("about.mrf.simple.reject") }}

      -

      {{ $t("about.mrf_policy_simple_reject_desc") }}

      +

      {{ $t("about.mrf.simple.reject_desc") }}

      • -

        {{ $t("about.mrf_policy_simple_quarantine") }}

        +

        {{ $t("about.mrf.simple.quarantine") }}

        -

        {{ $t("about.mrf_policy_simple_quarantine_desc") }}

        +

        {{ $t("about.mrf.simple.quarantine_desc") }}

        • -

          {{ $t("about.mrf_policy_simple_ftl_removal") }}

          +

          {{ $t("about.mrf.simple.ftl_removal") }}

          -

          {{ $t("about.mrf_policy_simple_ftl_removal_desc") }}

          +

          {{ $t("about.mrf.simple.ftl_removal_desc") }}

          • -

            {{ $t("about.mrf_policy_simple_media_nsfw") }}

            +

            {{ $t("about.mrf.simple.media_nsfw") }}

            -

            {{ $t("about.mrf_policy_simple_media_nsfw_desc") }}

            +

            {{ $t("about.mrf.simple.media_nsfw_desc") }}

            • -

              {{ $t("about.mrf_policy_simple_media_removal") }}

              +

              {{ $t("about.mrf.simple.media_removal") }}

              -

              {{ $t("about.mrf_policy_simple_media_removal_desc") }}

              +

              {{ $t("about.mrf.simple.media_removal_desc") }}