fix(lang): string edits (#2229)

* fix(lang): string edits * fix: correct notif type ordering * fix(lang): a few more edits * fix(frontend): align & wrap media attributes properly * fix(lang): use consistent cache names
2025-09-17 17:24:35 +02:00 · 2021-10-24 12:08:03 -04:00
parent a35209c739
commit ab20c21184
8 changed files with 108 additions and 92 deletions
--- a/src/components/IssueDetails/IssueDescription/index.tsx
+++ b/src/components/IssueDetails/IssueDescription/index.tsx
@@ -5,13 +5,12 @@ import React, { Fragment, useState } from 'react';
 import { defineMessages, useIntl } from 'react-intl';
 import ReactMarkdown from 'react-markdown';
 import { Permission, useUser } from '../../../hooks/useUser';
+import globalMessages from '../../../i18n/globalMessages';
 import Button from '../../Common/Button';

 const messages = defineMessages({
  description: 'Description',
  edit: 'Edit Description',
-  cancel: 'Cancel',
-  save: 'Save Changes',
  deleteissue: 'Delete Issue',
 });

@@ -125,10 +124,10 @@ const IssueDescription: React.FC<IssueDescriptionProps> = ({
                    type="button"
                    onClick={() => setIsEditing(false)}
                  >
-                    <span>{intl.formatMessage(messages.cancel)}</span>
+                    <span>{intl.formatMessage(globalMessages.cancel)}</span>
                  </Button>
                  <Button buttonType="primary">
-                    <span>{intl.formatMessage(messages.save)}</span>
+                    <span>{intl.formatMessage(globalMessages.save)}</span>
                  </Button>
                </div>
              </Form>
--- a/src/components/IssueDetails/index.tsx
+++ b/src/components/IssueDetails/index.tsx
@@ -43,12 +43,13 @@ const messages = defineMessages({
  reopenissue: 'Reopen Issue',
  reopenissueandcomment: 'Reopen with Comment',
  issuepagetitle: 'Issue',
-  openinradarr: 'Open in Radarr',
-  openinsonarr: 'Open in Sonarr',
-  toasteditdescriptionsuccess: 'Successfully edited the issue description.',
-  toasteditdescriptionfailed: 'Something went wrong editing the description.',
-  toaststatusupdated: 'Issue status updated.',
-  toaststatusupdatefailed: 'Something went wrong updating the issue status.',
+  openinarr: 'Open in {arr}',
+  toasteditdescriptionsuccess: 'Edited the issue description successfully!',
+  toasteditdescriptionfailed:
+    'Something went wrong while editing the issue description.',
+  toaststatusupdated: 'Updated the issue status successfully!',
+  toaststatusupdatefailed:
+    'Something went wrong while updating the issue status.',
  issuetype: 'Issue Type',
  mediatype: 'Media Type',
  lastupdated: 'Last Updated',
@@ -62,8 +63,8 @@ const messages = defineMessages({
  episode: 'Episode {episodeNumber}',
  deleteissue: 'Delete Issue',
  deleteissueconfirm: 'Are you sure you want to delete this issue?',
-  toastissuedeleted: 'Issue deleted succesfully.',
-  toastissuedeletefailed: 'Something went wrong deleting the issue.',
+  toastissuedeleted: 'Deleted the issue successfully!',
+  toastissuedeletefailed: 'Something went wrong while deleting the issue.',
  nocomments: 'No comments.',
  unknownissuetype: 'Unknown',
 });
@@ -172,12 +173,7 @@ const IssueDetails: React.FC = () => {
        height: 493,
      }}
    >
-      <PageTitle
-        title={[
-          intl.formatMessage(messages.issuepagetitle),
-          isMovie(data) ? data.title : data.name,
-        ]}
-      />
+      <PageTitle title={[intl.formatMessage(messages.issuepagetitle), title]} />
      <Transition
        enter="transition opacity-0 duration-300"
        enterFrom="opacity-0"
@@ -383,11 +379,12 @@ const IssueDetails: React.FC = () => {
                  >
                    <ExternalLinkIcon />
                    <span>
-                      {intl.formatMessage(
-                        issueData.media.mediaType === MediaType.MOVIE
-                          ? messages.openinradarr
-                          : messages.openinsonarr
-                      )}
+                      {intl.formatMessage(messages.openinarr, {
+                        arr:
+                          issueData.media.mediaType === MediaType.MOVIE
+                            ? 'Radarr'
+                            : 'Sonarr',
+                      })}
                    </span>
                  </Button>
                )}
@@ -581,11 +578,12 @@ const IssueDetails: React.FC = () => {
                >
                  <ExternalLinkIcon />
                  <span>
-                    {intl.formatMessage(
-                      issueData.media.mediaType === MediaType.MOVIE
-                        ? messages.openinradarr
-                        : messages.openinsonarr
-                    )}
+                    {intl.formatMessage(messages.openinarr, {
+                      arr:
+                        issueData.media.mediaType === MediaType.MOVIE
+                          ? 'Radarr'
+                          : 'Sonarr',
+                    })}
                  </span>
                </Button>
              )}
--- a/src/components/ManageSlideOver/index.tsx
+++ b/src/components/ManageSlideOver/index.tsx
@@ -27,8 +27,8 @@ const messages = defineMessages({
  manageModalClearMedia: 'Clear Media Data',
  manageModalClearMediaWarning:
    '* This will irreversibly remove all data for this {mediaType}, including any requests. If this item exists in your Plex library, the media information will be recreated during the next scan.',
-  openarr: 'Open {mediaType} in {arr}',
-  openarr4k: 'Open {mediaType} in 4K {arr}',
+  openarr: 'Open in {arr}',
+  openarr4k: 'Open in 4K {arr}',
  downloadstatus: 'Download Status',
  markavailable: 'Mark as Available',
  mark4kavailable: 'Mark as Available in 4K',
--- a/src/components/NotificationTypeSelector/index.tsx
+++ b/src/components/NotificationTypeSelector/index.tsx
@@ -37,17 +37,19 @@ const messages = defineMessages({
    'Send notifications when media requests are declined.',
  usermediadeclinedDescription:
    'Get notified when your media requests are declined.',
-  issuecreated: 'Issue Created',
-  issuecreatedDescription: 'Send notifications when new issues are created.',
+  issuecreated: 'Issue Reported',
+  issuecreatedDescription: 'Send notifications when issues are reported.',
+  userissuecreatedDescription: 'Get notified when other users report issues.',
  issuecomment: 'Issue Comment',
  issuecommentDescription:
    'Send notifications when issues receive new comments.',
  userissuecommentDescription:
-    'Send notifications when your issue receives new comments.',
+    'Get notified when your issues receive new comments.',
+  adminissuecommentDescription:
+    'Get notified when issues receive new comments.',
  issueresolved: 'Issue Resolved',
  issueresolvedDescription: 'Send notifications when issues are resolved.',
-  userissueresolvedDescription:
-    'Send notifications when your issues are resolved.',
+  userissueresolvedDescription: 'Get notified when your issues are resolved.',
 });

 export const hasNotificationType = (
@@ -99,7 +101,7 @@ export interface NotificationItem {
  name: string;
  description: string;
  value: Notification;
-  hasNotifyUser?: boolean;
+  hasNotifyUser: boolean;
  children?: NotificationItem[];
  hidden?: boolean;
 }
@@ -187,6 +189,7 @@ const NotificationTypeSelector: React.FC<NotificationTypeSelectorProps> = ({
            : messages.mediarequestedDescription
        ),
        value: Notification.MEDIA_PENDING,
+        hasNotifyUser: false,
        hidden: user && !hasPermission(Permission.MANAGE_REQUESTS),
      },
      {
@@ -198,6 +201,7 @@ const NotificationTypeSelector: React.FC<NotificationTypeSelectorProps> = ({
            : messages.mediaAutoApprovedDescription
        ),
        value: Notification.MEDIA_AUTO_APPROVED,
+        hasNotifyUser: false,
        hidden: user && !hasPermission(Permission.MANAGE_REQUESTS),
      },
      {
@@ -245,24 +249,33 @@ const NotificationTypeSelector: React.FC<NotificationTypeSelectorProps> = ({
        ),
        value: Notification.MEDIA_FAILED,
        hidden: user && !hasPermission(Permission.MANAGE_REQUESTS),
+        hasNotifyUser: false,
      },
      {
        id: 'issue-created',
        name: intl.formatMessage(messages.issuecreated),
-        description: intl.formatMessage(messages.issuecreatedDescription),
+        description: intl.formatMessage(
+          user
+            ? messages.userissuecreatedDescription
+            : messages.issuecreatedDescription
+        ),
        value: Notification.ISSUE_CREATED,
        hidden: user && !hasPermission(Permission.MANAGE_ISSUES),
+        hasNotifyUser: false,
      },
      {
        id: 'issue-comment',
        name: intl.formatMessage(messages.issuecomment),
        description: intl.formatMessage(
          user
-            ? messages.userissuecommentDescription
+            ? hasPermission(Permission.MANAGE_ISSUES)
+              ? messages.adminissuecommentDescription
+              : messages.userissuecommentDescription
            : messages.issuecommentDescription
        ),
        value: Notification.ISSUE_COMMENT,
-        hasNotifyUser: true,
+        hasNotifyUser:
+          !user || hasPermission(Permission.MANAGE_ISSUES) ? false : true,
      },
      {
        id: 'issue-resolved',
--- a/src/components/PermissionEdit/index.tsx
+++ b/src/components/PermissionEdit/index.tsx
@@ -9,21 +9,24 @@ export const messages = defineMessages({
    'Full administrator access. Bypasses all other permission checks.',
  users: 'Manage Users',
  usersDescription:
-    'Grant permission to manage Overseerr users. Users with this permission cannot modify users with or grant the Admin privilege.',
+    'Grant permission to manage users. Users with this permission cannot modify users with or grant the Admin privilege.',
  settings: 'Manage Settings',
  settingsDescription:
-    'Grant permission to modify Overseerr settings. A user must have this permission to grant it to others.',
+    'Grant permission to modify global settings. A user must have this permission to grant it to others.',
  managerequests: 'Manage Requests',
  managerequestsDescription:
-    'Grant permission to manage Overseerr requests. All requests made by a user with this permission will be automatically approved.',
+    'Grant permission to manage media requests. All requests made by a user with this permission will be automatically approved.',
  request: 'Request',
-  requestDescription: 'Grant permission to request non-4K media.',
+  requestDescription: 'Grant permission to submit requests for non-4K media.',
  requestMovies: 'Request Movies',
-  requestMoviesDescription: 'Grant permission to request non-4K movies.',
+  requestMoviesDescription:
+    'Grant permission to submit requests for non-4K movies.',
  requestTv: 'Request Series',
-  requestTvDescription: 'Grant permission to request non-4K series.',
+  requestTvDescription:
+    'Grant permission to submit requests for non-4K series.',
  autoapprove: 'Auto-Approve',
-  autoapproveDescription: 'Grant automatic approval for all non-4K requests.',
+  autoapproveDescription:
+    'Grant automatic approval for all non-4K media requests.',
  autoapproveMovies: 'Auto-Approve Movies',
  autoapproveMoviesDescription:
    'Grant automatic approval for non-4K movie requests.',
@@ -31,7 +34,8 @@ export const messages = defineMessages({
  autoapproveSeriesDescription:
    'Grant automatic approval for non-4K series requests.',
  autoapprove4k: 'Auto-Approve 4K',
-  autoapprove4kDescription: 'Grant automatic approval for all 4K requests.',
+  autoapprove4kDescription:
+    'Grant automatic approval for all 4K media requests.',
  autoapprove4kMovies: 'Auto-Approve 4K Movies',
  autoapprove4kMoviesDescription:
    'Grant automatic approval for 4K movie requests.',
@@ -39,22 +43,25 @@ export const messages = defineMessages({
  autoapprove4kSeriesDescription:
    'Grant automatic approval for 4K series requests.',
  request4k: 'Request 4K',
-  request4kDescription: 'Grant permission to request 4K media.',
+  request4kDescription: 'Grant permission to submit requests for 4K media.',
  request4kMovies: 'Request 4K Movies',
-  request4kMoviesDescription: 'Grant permission to request 4K movies.',
+  request4kMoviesDescription:
+    'Grant permission to submit requests for 4K movies.',
  request4kTv: 'Request 4K Series',
-  request4kTvDescription: 'Grant permission to request 4K series.',
+  request4kTvDescription: 'Grant permission to submit requests for 4K series.',
  advancedrequest: 'Advanced Requests',
  advancedrequestDescription:
-    'Grant permission to use advanced request options.',
+    'Grant permission to modify advanced media request options.',
  viewrequests: 'View Requests',
-  viewrequestsDescription: "Grant permission to view other users' requests.",
+  viewrequestsDescription:
+    'Grant permission to view media requests submitted by other users.',
  manageissues: 'Manage Issues',
-  manageissuesDescription: 'Grant permission to manage Overseerr issues.',
-  createissues: 'Create Issues',
-  createissuesDescription: 'Grant permission to create new issues.',
+  manageissuesDescription: 'Grant permission to manage media issues.',
+  createissues: 'Report Issues',
+  createissuesDescription: 'Grant permission to report media issues.',
  viewissues: 'View Issues',
-  viewissuesDescription: "Grant permission to view other users' issues.",
+  viewissuesDescription:
+    'Grant permission to view media issues reported by other users.',
 });

 interface PermissionEditProps {