-
The report will be sent to your instance moderators. You can provide an explanation of why you are reporting this account below:
+
{{$t('user_reporting.add_comment_description')}}
-
The account is from another server. Send an anonymized copy of the report there as well?
-
Forward to {{remoteInstance}}
+
{{$t('user_reporting.forward_description')}}
+
{{$t('user_reporting.forward_to', [remoteInstance])}}
-
+
- An error occured processing your request
+ {{$t('user_reporting.generic_error')}}
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 8292c921..731c68b4 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -453,6 +453,15 @@
"profile_does_not_exist": "Sorry, this profile does not exist.",
"profile_loading_error": "Sorry, there was an error loading this profile."
},
+ "user_reporting": {
+ "title": "Reporting {0}",
+ "add_comment_description": "The report will be sent to your instance moderators. You can provide an explanation of why you are reporting this account below:",
+ "additional_comments": "Additional comments",
+ "forward_description": "The account is from another server. Send an anonymized copy of the report there as well?",
+ "forward_to": "Forward to {0}",
+ "submit": "Submit",
+ "generic_error": "An error occured processing your request."
+ },
"who_to_follow": {
"more": "More",
"who_to_follow": "Who to follow"
--
cgit v1.2.3-70-g09d2
From 5d0bae5569071dbfb6fe038325af620eb83cf865 Mon Sep 17 00:00:00 2001
From: taehoon
Date: Wed, 20 Mar 2019 13:46:53 -0400
Subject: update generic error message
---
src/components/user_reporting_modal/user_reporting_modal.vue | 1 +
src/i18n/en.json | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
(limited to 'src/components/user_reporting_modal')
diff --git a/src/components/user_reporting_modal/user_reporting_modal.vue b/src/components/user_reporting_modal/user_reporting_modal.vue
index 6ad4de17..fd9dd797 100644
--- a/src/components/user_reporting_modal/user_reporting_modal.vue
+++ b/src/components/user_reporting_modal/user_reporting_modal.vue
@@ -90,6 +90,7 @@
.alert {
margin: 1em 0 0 0;
+ line-height: 1.3em;
}
}
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 731c68b4..f7a52c90 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -460,7 +460,7 @@
"forward_description": "The account is from another server. Send an anonymized copy of the report there as well?",
"forward_to": "Forward to {0}",
"submit": "Submit",
- "generic_error": "An error occured processing your request."
+ "generic_error": "An error occurred while processing your request."
},
"who_to_follow": {
"more": "More",
--
cgit v1.2.3-70-g09d2
From f364068e103641e761e2ca2c6d337c3536112546 Mon Sep 17 00:00:00 2001
From: taehoon
Date: Fri, 22 Mar 2019 14:19:50 -0400
Subject: Improve mobile layout
---
src/App.scss | 1 +
.../user_reporting_modal/user_reporting_modal.vue | 60 +++++++++++++++-------
2 files changed, 42 insertions(+), 19 deletions(-)
(limited to 'src/components/user_reporting_modal')
diff --git a/src/App.scss b/src/App.scss
index b1c65ade..07b33f47 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -379,6 +379,7 @@ main-router {
.panel-heading {
display: flex;
+ flex: none;
border-radius: $fallback--panelRadius $fallback--panelRadius 0 0;
border-radius: var(--panelRadius, $fallback--panelRadius) var(--panelRadius, $fallback--panelRadius) 0 0;
background-size: cover;
diff --git a/src/components/user_reporting_modal/user_reporting_modal.vue b/src/components/user_reporting_modal/user_reporting_modal.vue
index fd9dd797..b2cb6911 100644
--- a/src/components/user_reporting_modal/user_reporting_modal.vue
+++ b/src/components/user_reporting_modal/user_reporting_modal.vue
@@ -26,7 +26,7 @@