itizawa 5 лет назад
Родитель
Сommit
6272321aac

+ 4 - 3
resource/locales/en-US/translation.json

@@ -339,11 +339,12 @@
   "toaster": {
     "update_successed": "Succeeded to update {{target}}",
     "give_user_admin": "Succeeded to give {{username}} admin",
-    "remove_user_admin": "Succeeded to remove {{username}} admin ",
+    "remove_user_admin": "Succeeded to remove {{username}} admin",
     "activate_user_success": "Succeeded to activating {{username}}",
     "deactivate_user_success": "Succeeded to deactivate {{username}}",
-    "remove_user_success": "Succeeded to removing {{username}} ",
-    "remove_external_user_success": "Succeeded to remove {{accountId}} "
+    "remove_user_success": "Succeeded to removing {{username}}",
+    "remove_external_user_success": "Succeeded to remove {{accountId}}",
+    "remove_share_link_success": "Succeeded to remove {{shareLinkId}}"
   },
   "template": {
     "modal_label": {

+ 2 - 1
resource/locales/ja/translation.json

@@ -344,7 +344,8 @@
     "activate_user_success": "{{username}}を有効化しました",
     "deactivate_user_success": "{{username}}を無効化しました",
     "remove_user_success": "{{username}}を削除しました",
-    "remove_external_user_success": "{{accountId}}を削除しました"
+    "remove_external_user_success": "{{accountId}}を削除しました",
+    "remove_share_link_success": "{{shareLinkId}}を削除しました"
   },
   "template": {
     "modal_label": {

+ 6 - 4
src/client/js/components/ShareLinkList.jsx

@@ -1,24 +1,25 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import * as toastr from 'toastr';
+
 
 import { withTranslation } from 'react-i18next';
+import { toastSuccess, toastError } from '../util/apiNotification';
 
 import { withUnstatedContainers } from './UnstatedUtils';
 
 import AppContainer from '../services/AppContainer';
 
 const ShareLinkList = (props) => {
-  const { appContainer } = props;
+  const { t, appContainer } = props;
 
   async function deleteLinkHandler(shareLinkId) {
     try {
       const res = await appContainer.apiv3Delete(`/share-links/${shareLinkId}`);
       const { deletedShareLink } = res.data;
-      toastr.success(`Successfully deleted ${deletedShareLink._id}`);
+      toastSuccess(t('remove_share_link_success', { shareLinkId: deletedShareLink._id }));
     }
     catch (err) {
-      toastr.error(new Error(`Failed to delete ${shareLinkId}`));
+      toastError(err);
     }
   }
 
@@ -83,6 +84,7 @@ const ShareLinkList = (props) => {
 const ShareLinkListWrapper = withUnstatedContainers(ShareLinkList, [AppContainer]);
 
 ShareLinkList.propTypes = {
+  t: PropTypes.func.isRequired, //  i18next
   appContainer: PropTypes.instanceOf(AppContainer).isRequired,
 };