refs 114888 fix feedback trtranslation

packages/app/public/static/locales/en_US/commons.json

@@ -59,7 +59,8 @@
     "color_mode": "Color mode",
     "sidebar_mode": "Sidebar mode",
     "sidebar_mode_editor": "Sidebar mode on editor",
-    "use_os_settings": "Use OS settings"
+    "use_os_settings": "Use OS settings",
+    "feedback": "Feedback"
   },
 
   "copy_to_clipboard": {

packages/app/public/static/locales/en_US/translation.json

@@ -811,7 +811,6 @@
     "go_to_settings": "Go to settings to enable the feature"
   },
   "questionnaire": {
-    "feedback": "Feedback",
     "give_us_feedback": "Give us feedback for improvements",
     "thank_you_for_answering": "Thank you for answering",
     "additional_feedback": "Send us additional feedback from the user icon dropdown.",

packages/app/public/static/locales/ja_JP/commons.json

@@ -58,7 +58,8 @@
     "color_mode": "カラーモード",
     "sidebar_mode": "サイドバーモード",
     "sidebar_mode_editor": "サイドバーモード(編集時)",
-    "use_os_settings": "OS設定を利用する"
+    "use_os_settings": "OS設定を利用する",
+    "feedback": "ご意見・ご要望"
   },
 
   "copy_to_clipboard": {

packages/app/public/static/locales/ja_JP/translation.json

@@ -809,7 +809,6 @@
     "go_to_settings": "設定する"
   },
   "questionnaire": {
-    "feedback": "ご意見・ご要望",
     "give_us_feedback": "GROWI の改善のために、アンケートにご協力ください",
     "thank_you_for_answering": "ご回答ありがとうございます",
     "additional_feedback": "その他ご意見ご要望はユーザーアイコンのドロップダウンからお願い致します。",

packages/app/public/static/locales/zh_CN/commons.json

@@ -59,7 +59,8 @@
 		"color_mode": "颜色模式",
 		"sidebar_mode": "边栏模式",
 		"sidebar_mode_editor": "编辑器上的边栏模式",
-		"use_os_settings": "使用操作系统设置"
+		"use_os_settings": "使用操作系统设置",
+    "feedback": "意见和要求"
   },
 
 	"copy_to_clipboard": {

packages/app/public/static/locales/zh_CN/translation.json

@@ -810,7 +810,6 @@
     "recently_created": "最近创建页面"
   },
   "questionnaire": {
-    "feedback": "意见和要求",
     "give_us_feedback": "向我们提供反馈以进行改进",
     "thank_you_for_answering": "谢谢你的回答",
     "additional_feedback": "从用户图标下拉菜单向我们发送更多反馈。",

packages/app/src/components/Navbar/PersonalDropdown.tsx

@@ -12,8 +12,7 @@ import { useCurrentUser } from '~/stores/context';
 import ProactiveQuestionnaireModal from '../Questionnaire/ProactiveQuestionnaireModal';
 
 const PersonalDropdown = (): JSX.Element => {
-  const { t } = useTranslation();
-  const { t: tCommon } = useTranslation('commons');
+  const { t } = useTranslation('commons');
   const { data: currentUser } = useCurrentUser();
 
   const [isQuestionnaireModalOpen, setQuestionnaireModalOpen] = useState(false);
@@ -65,12 +64,12 @@ const PersonalDropdown = (): JSX.Element => {
           <div className="btn-group btn-block mt-2" role="group">
             <Link href={`/user/${currentUser.username}`}>
               <a className="btn btn-sm btn-outline-secondary col" data-testid="grw-personal-dropdown-menu-user-home">
-                <i className="icon-fw icon-home"></i>{tCommon('personal_dropdown.home')}
+                <i className="icon-fw icon-home"></i>{t('personal_dropdown.home')}
               </a>
             </Link>
             <Link href="/me">
               <a className="btn btn-sm btn-outline-secondary col" data-testid="grw-personal-dropdown-menu-user-settings">
-                <i className="icon-fw icon-wrench"></i>{tCommon('personal_dropdown.settings')}
+                <i className="icon-fw icon-wrench"></i>{t('personal_dropdown.settings')}
               </a>
             </Link>
           </div>
@@ -79,12 +78,14 @@ const PersonalDropdown = (): JSX.Element => {
         <div className="dropdown-divider"></div>
 
         <button type="button" className="dropdown-item" onClick={() => setQuestionnaireModalOpen(true)}>
-          <i className="icon-fw icon-pencil"></i>{ t('questionnaire.feedback') }
+          <i className="icon-fw icon-pencil"></i>{t('personal_dropdown.feedback')}
         </button>
 
         <div className="dropdown-divider"></div>
 
-        <button type="button" className="dropdown-item" onClick={logoutHandler}><i className="icon-fw icon-power"></i>{tCommon('Sign out')}</button>
+        <button type="button" className="dropdown-item" onClick={logoutHandler}>
+          <i className="icon-fw icon-power"></i>{t('Sign out')}
+        </button>
       </div>
 
       <ProactiveQuestionnaireModal isOpen={isQuestionnaireModalOpen} onClose={() => setQuestionnaireModalOpen(false)} />