kaori 5 years ago
parent
commit
d66d31fe79

+ 8 - 8
src/client/js/components/Admin/Customize/CustomizeFunctionSetting.jsx

@@ -81,29 +81,29 @@ class CustomizeFunctionSetting extends React.Component {
             </div>
 
             <PagingSizeUncontrolledDropdown
-              label="admin:customize_setting.function_options.list_num_s"
-              desc="admin:customize_setting.function_options.list_num_desc_s"
+              label={t('admin:customize_setting.function_options.list_num_s')}
+              desc={t('admin:customize_setting.function_options.list_num_desc_s')}
               toggleLabel={adminCustomizeContainer.state.pageLimitationS}
               dropdownItemSize={[10, 20, 50, 100]}
               onChangeDropdownItem={adminCustomizeContainer.switchPageListLimitationS}
             />
             <PagingSizeUncontrolledDropdown
-              label="admin:customize_setting.function_options.list_num_m"
-              desc="admin:customize_setting.function_options.list_num_desc_m"
+              label={t('admin:customize_setting.function_options.list_num_m')}
+              desc={t('admin:customize_setting.function_options.list_num_desc_m')}
               toggleLabel={adminCustomizeContainer.state.pageLimitationM}
               dropdownItemSize={[5, 10, 20, 50, 100]}
               onChangeDropdownItem={adminCustomizeContainer.switchPageListLimitationM}
             />
             <PagingSizeUncontrolledDropdown
-              label="admin:customize_setting.function_options.list_num_l"
-              desc="admin:customize_setting.function_options.list_num_desc_l"
+              label={t('admin:customize_setting.function_options.list_num_l')}
+              desc={t('admin:customize_setting.function_options.list_num_desc_l')}
               toggleLabel={adminCustomizeContainer.state.pageLimitationL}
               dropdownItemSize={[20, 50, 100, 200]}
               onChangeDropdownItem={adminCustomizeContainer.switchPageListLimitationL}
             />
             <PagingSizeUncontrolledDropdown
-              label="admin:customize_setting.function_options.list_num_xl"
-              desc="admin:customize_setting.function_options.list_num_desc_xl"
+              label={t('admin:customize_setting.function_options.list_num_xl')}
+              desc={t('admin:customize_setting.function_options.list_num_desc_xl')}
               toggleLabel={adminCustomizeContainer.state.pageLimitationXL}
               dropdownItemSize={[5, 10, 20, 50, 100]}
               onChangeDropdownItem={adminCustomizeContainer.switchPageListLimitationXL}

+ 8 - 9
src/client/js/components/Admin/Customize/PagingSizeUncontrolledDropdown.jsx

@@ -9,7 +9,6 @@ import { withUnstatedContainers } from '../../UnstatedUtils';
 
 
 const PagingSizeUncontrolledDropdown = (props) => {
-  const { t } = props;
 
   function dropdownItemOnClickHandler(num) {
     if (props.onChangeDropdownItem === null) {
@@ -23,7 +22,7 @@ const PagingSizeUncontrolledDropdown = (props) => {
       <div className="form-group row">
         <div className="offset-md-3 col-md-6 text-left">
           <div className="my-0 w-100">
-            <label>{t(props.label)}</label>
+            <label>{props.label}</label>
           </div>
           <UncontrolledDropdown>
             <DropdownToggle className="text-right col-6" caret>
@@ -31,16 +30,16 @@ const PagingSizeUncontrolledDropdown = (props) => {
             </DropdownToggle>
             <DropdownMenu className="dropdown-menu" role="menu">
               {props.dropdownItemSize.map((num) => {
-                    return (
-                      <DropdownItem key={num} role="presentation" onClick={() => dropdownItemOnClickHandler(num)}>
-                        <a role="menuitem">{num}</a>
-                      </DropdownItem>
-                    );
-                  })}
+                return (
+                  <DropdownItem key={num} role="presentation" onClick={() => dropdownItemOnClickHandler(num)}>
+                    <a role="menuitem">{num}</a>
+                  </DropdownItem>
+                );
+              })}
             </DropdownMenu>
           </UncontrolledDropdown>
           <p className="form-text text-muted">
-            {t(props.desc)}
+            {props.desc}
           </p>
         </div>
       </div>