Address feedback: use the existing always_hidden and always_displayed translations

apps/app/public/static/locales/en_US/admin.json

@@ -19,8 +19,6 @@
     "readonly_users_access": "Read only users' access",
     "always_hidden": "Always hidden",
     "always_displayed": "Always displayed",
-    "displayed": "Displayed",
-    "hidden": "Hidden",
     "Fixed by env var": "This is fixed by the env var <code>{{key}}={{value}}</code>.",
     "register_limitation": "Register limitation",
     "register_limitation_desc": "Restriction of new users' registration",

apps/app/public/static/locales/fr_FR/admin.json

@@ -19,7 +19,6 @@
     "readonly_users_access": "Accès des utilisateurs lecture seule",
     "always_hidden": "Toujours caché",
     "always_displayed": "Toujours affiché",
-    "displayed_or_hidden": "Caché / Affiché",
     "Fixed by env var": "Configuré par la variable d'environnement <code>{{key}}={{value}}</code>.",
     "register_limitation": "Paramètres d'inscription",
     "register_limitation_desc": "Restreindre l'inscription de nouveaux utilisateurs",

apps/app/public/static/locales/ja_JP/admin.json

@@ -28,8 +28,6 @@
     "readonly_users_access": "閲覧のみユーザーのアクセス",
     "always_hidden": "表示しない",
     "always_displayed": "表示する",
-    "displayed": "表示する",
-    "hidden": "表示しない",
     "Fixed by env var": "環境変数 <code>{{forcewikimode}}={{wikimode}}</code> により固定されています。",
     "register_limitation": "登録の制限",
     "register_limitation_desc": "新しいユーザーを登録する方法を制限します。",

apps/app/public/static/locales/zh_CN/admin.json

@@ -26,7 +26,6 @@
     "set_point": "设定值",
     "always_displayed": "始终显示",
     "always_hidden": "总是隐藏",
-    "displayed_or_hidden": "隐藏 / 显示",
     "Guest Users Access": "来宾用户访问",
     "readonly_users_access": "只浏览用户的访问",
 		"Fixed by env var": "这是由env var<code>%s=%s</code>修复的。",

apps/app/src/client/components/Admin/Security/SecuritySetting.jsx

@@ -360,8 +360,8 @@ class SecuritySetting extends React.Component {
         <div className="row mb-4">
           <div className="col-md-10">
             <div className="row">
+
               {/* Left Column: Labels */}
-              {/* Increased to col-5 to give more room for longer labels */}
               <div className="col-5 d-flex flex-column align-items-end p-4">
                 <div className="fw-bold mb-4">{t('public')}</div>
                 <div className="fw-bold mb-4">{t('anyone_with_the_link')}</div>
@@ -370,7 +370,6 @@ class SecuritySetting extends React.Component {
               </div>
 
               {/* Right Column: Content */}
-              {/* Adjusted to col-7 to compensate for col-5 on the left */}
               <div className="col-7 d-flex flex-column align-items-start pt-4 pb-4">
                 <div className="mb-4 d-flex align-items-center">
                   <span className="material-symbols-outlined text-success me-1"></span>
@@ -393,8 +392,8 @@ class SecuritySetting extends React.Component {
                       aria-expanded="true"
                     >
                       <span className="float-start">
-                        {adminGeneralSecurityContainer.state.currentOwnerRestrictionDisplayMode === 'Displayed' && t('security_settings.displayed')}
-                        {adminGeneralSecurityContainer.state.currentOwnerRestrictionDisplayMode === 'Hidden' && t('security_settings.hidden')}
+                        {adminGeneralSecurityContainer.state.currentOwnerRestrictionDisplayMode === 'Displayed' && t('security_settings.always_displayed')}
+                        {adminGeneralSecurityContainer.state.currentOwnerRestrictionDisplayMode === 'Hidden' && t('security_settings.always_hidden')}
                       </span>
                     </button>
                     <div className="dropdown-menu" aria-labelledby="ownerRestrictionDropdownButton">
@@ -403,14 +402,14 @@ class SecuritySetting extends React.Component {
                         type="button"
                         onClick={() => { adminGeneralSecurityContainer.changeOwnerRestrictionDisplayMode('Displayed') }}
                       >
-                        {t('security_settings.displayed')}
+                        {t('security_settings.always_displayed')}
                       </button>
                       <button
                         className="dropdown-item"
                         type="button"
                         onClick={() => { adminGeneralSecurityContainer.changeOwnerRestrictionDisplayMode('Hidden') }}
                       >
-                        {t('security_settings.hidden')}
+                        {t('security_settings.always_hidden')}
                       </button>
                     </div>
                   </div>
@@ -428,8 +427,8 @@ class SecuritySetting extends React.Component {
                       aria-expanded="true"
                     >
                       <span className="float-start">
-                        {adminGeneralSecurityContainer.state.currentGroupRestrictionDisplayMode === 'Displayed' && t('security_settings.displayed')}
-                        {adminGeneralSecurityContainer.state.currentGroupRestrictionDisplayMode === 'Hidden' && t('security_settings.hidden')}
+                        {adminGeneralSecurityContainer.state.currentGroupRestrictionDisplayMode === 'Displayed' && t('security_settings.always_displayed')}
+                        {adminGeneralSecurityContainer.state.currentGroupRestrictionDisplayMode === 'Hidden' && t('security_settings.always_hidden')}
                       </span>
                     </button>
                     <div className="dropdown-menu" aria-labelledby="groupRestrictionDropdownButton">
@@ -438,14 +437,14 @@ class SecuritySetting extends React.Component {
                         type="button"
                         onClick={() => { adminGeneralSecurityContainer.changeGroupRestrictionDisplayMode('Displayed') }}
                       >
-                        {t('security_settings.displayed')}
+                        {t('security_settings.always_displayed')}
                       </button>
                       <button
                         className="dropdown-item"
                         type="button"
                         onClick={() => { adminGeneralSecurityContainer.changeGroupRestrictionDisplayMode('Hidden') }}
                       >
-                        {t('security_settings.hidden')}
+                        {t('security_settings.always_hidden')}
                       </button>
                     </div>
                   </div>

apps/app/src/client/components/PageComment/Comment.tsx

@@ -82,6 +82,7 @@ export const Comment = (props: CommentProps): JSX.Element => {
     let className = 'page-comment flex-column';
 
     // TODO: fix so that `comment.createdAt` to be type Date https://redmine.weseek.co.jp/issues/113876
+    // make it the same as the one under.. maybe
     const commentCreatedAtFixed = typeof comment.createdAt === 'string'
       ? parseISO(comment.createdAt)
       : comment.createdAt;