Просмотр исходного кода

Merge branch 'feat/questionnaire' into fix/116388-116389-fix-ci-code-scanning-error

Futa Arai 3 лет назад
Родитель
Сommit
589bc8a722

+ 3 - 1
packages/app/public/static/locales/en_US/commons.json

@@ -114,7 +114,9 @@
     "history_of_growi_usage": "History of GROWI usage",
     "occupation": "Occupation",
     "position": "Position",
-    "comment_on_growi": "Comment on GROWI"
+    "comment_on_growi": "Comment on GROWI",
+    "successfully_submitted": "Your survey has been submitted.",
+    "thanks_for_answering": "Thank you very much for answering."
   },
 
   "not_found_page": {

+ 0 - 2
packages/app/public/static/locales/en_US/translation.json

@@ -822,8 +822,6 @@
     "settings": "Questionnaire settings",
     "failed_to_send": "Failed to send feedback",
     "denied": "The questionnaire won't be shown again",
-    "successfully_submitted": "Your survey has been submitted.",
-    "thanks_for_answering": "Thank you very much for taking the time to complete the survey.",
     "personal_settings_explanation": "Questionnaires for improving GROWI will be shown. If you have other feedbacks, you can send them from the user icon dropdown.",
     "enable_questionnaire": "Enable questionnaire",
     "disabled_by_admin": "Questionnaire is disabled by admin"

+ 3 - 1
packages/app/public/static/locales/ja_JP/commons.json

@@ -113,7 +113,9 @@
     "history_of_growi_usage": "GROWI の利用歴",
     "occupation": "職種",
     "position": "役職",
-    "comment_on_growi": "GROWI へのコメント"
+    "comment_on_growi": "GROWI へのコメント",
+    "successfully_submitted": "アンケートの送信が完了しました。",
+    "thanks_for_answering": "アンケートのご回答誠にありがとうございました。"
   },
 
   "not_found_page": {

+ 0 - 2
packages/app/public/static/locales/ja_JP/translation.json

@@ -820,8 +820,6 @@
     "settings": "アンケート設定",
     "failed_to_send": "回答送信に失敗しました",
     "denied": "このアンケートは今後表示されません",
-    "successfully_submitted": "アンケートの送信が完了しました。",
-    "thanks_for_answering": "アンケートのご回答誠にありがとうございました。",
     "personal_settings_explanation": "GROWI 改善のためのアンケートが表示されるようになります。ご意見ご要望はユーザーアイコンのドロップダウンからお願いいたします。",
     "enable_questionnaire": "アンケートを有効にする",
     "disabled_by_admin": "管理者によってアンケートは無効化されています"

+ 3 - 1
packages/app/public/static/locales/zh_CN/commons.json

@@ -114,7 +114,9 @@
     "history_of_growi_usage": "GROWI的使用历史",
     "occupation": "职位",
     "position": "职业类型",
-    "comment_on_growi": "关于GROWI的评论"
+    "comment_on_growi": "关于GROWI的评论",
+    "successfully_submitted": "问卷已经发出。",
+    "thanks_for_answering": "非常感谢您完成问卷调查。"
   },
 
   "not_found_page": {

+ 0 - 2
packages/app/public/static/locales/zh_CN/translation.json

@@ -821,8 +821,6 @@
     "settings": "问卷设置",
     "failed_to_send": "无法发送反馈",
     "denied": "问卷不会再显示",
-    "successfully_submitted": "问卷已经发出。",
-    "thanks_for_answering": "非常感谢您完成问卷调查。",
     "personal_settings_explanation": "将展示改进 GROWI 的问卷。 如果您有其他反馈,可以从用户图标下拉菜单中发送。",
     "enable_questionnaire": "启用问卷",
     "disabled_by_admin": "问卷已被管理员禁用"

+ 1 - 1
packages/app/src/server/service/config-loader.ts

@@ -668,7 +668,7 @@ const ENV_VAR_NAME_TO_CONFIG_INFO = {
     ns: 'crowi',
     key: 'questionnaire:isAppSiteUrlHashed',
     type: ValueType.BOOLEAN,
-    default: true,
+    default: false,
   },
   SERVICE_TYPE: {
     ns: 'crowi',

+ 1 - 1
packages/app/test/cypress/integration/40-admin/40-admin--access-to-admin-page.spec.ts

@@ -35,7 +35,7 @@ context('Access to Admin page', () => {
     cy.getByTestid('v5-page-migration').should('be.visible');
     cy.get('#cbFileUpload').should('be.checked');
     cy.get('#isQuestionnaireEnabled').should('be.checked');
-    cy.get('#isAppSiteUrlHashed').should('be.checked');
+    cy.get('#isAppSiteUrlHashed').should('not.be.checked');
     cy.screenshot(`${ssPrefix}-admin-app`);
   });