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

Merge pull request #2122 from myrevery/fix/web-locale-scan-i18n

Improve grep match for hst_scan_i18n.sh
Jaap Marcus 4 лет назад
Родитель
Сommit
cd7431c15f
2 измененных файлов с 3 добавлено и 3 удалено
  1. 1 1
      web/locale/hst_scan_i18n.sh
  2. 2 2
      web/templates/pages/edit_server.html

+ 1 - 1
web/locale/hst_scan_i18n.sh

@@ -15,7 +15,7 @@ find ../.. \( -name '*.php' -o -name '*.html' -o -name '*.sh' \) | xgettext --ou
 OLDIFS=$IFS
 IFS=$'\n'
 for string in $(awk -F'SYSTEM=' '/data=".+ SYSTEM=[^"]/ {print $2}' $HESTIA/bin/v-list-sys-services | cut -d\' -f2); do
-    if [ -z "$(grep "$string" hestiacp.pot)" ]; then
+    if [ -z "$(grep "\"$string\"" hestiacp.pot)" ]; then
         echo -e "\n#: ../../bin/v-list-sys-services:"$(grep -n "$string" $HESTIA/bin/v-list-sys-services | cut -d: -f1)"\nmsgid \"$string\"\nmsgstr \"\"" >> hestiacp.pot
     fi
 done

+ 2 - 2
web/templates/pages/edit_server.html

@@ -725,7 +725,7 @@
 														<select class="vst-list" name="v_backup_type" id="backup_type">
 															<option value='ftp'><?=_('ftp'); ?></option>
 															<option value='sftp' <?php if((!empty($v_backup_type)) && (trim($v_backup_type,"'")  == 'sftp' )) echo 'selected="selected"'; ?>><?=_('sftp'); ?></option>
-															<option value="b2" <?php if((!empty($v_backup_type)) && (trim($v_backup_type,"'")  == 'b2' )) echo 'selected="selected"'; ?>><?=_('Backblaze '); ?>
+															<option value="b2" <?php if((!empty($v_backup_type)) && (trim($v_backup_type,"'")  == 'b2' )) echo 'selected="selected"'; ?>><?=_('Backblaze'); ?>
 														</select>
 														<br><br>
 													</td>
@@ -1035,7 +1035,7 @@
 												</tr>
 												<tr>
 													<td class="vst-text input-label">
-														<?=_('Prevent CSRF ');?>
+														<?=_('Prevent CSRF');?>
 													</td>
 												</tr>
 												<tr>