Skip to content

Commit cd7431c

Browse files
authored
Merge pull request hestiacp#2122 from myrevery/fix/web-locale-scan-i18n
Improve grep match for hst_scan_i18n.sh
2 parents fc68baf + 4cef8bf commit cd7431c

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

web/locale/hst_scan_i18n.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ find ../.. \( -name '*.php' -o -name '*.html' -o -name '*.sh' \) | xgettext --ou
1515
OLDIFS=$IFS
1616
IFS=$'\n'
1717
for string in $(awk -F'SYSTEM=' '/data=".+ SYSTEM=[^"]/ {print $2}' $HESTIA/bin/v-list-sys-services | cut -d\' -f2); do
18-
if [ -z "$(grep "$string" hestiacp.pot)" ]; then
18+
if [ -z "$(grep "\"$string\"" hestiacp.pot)" ]; then
1919
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
2020
fi
2121
done

web/templates/pages/edit_server.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -725,7 +725,7 @@
725725
<select class="vst-list" name="v_backup_type" id="backup_type">
726726
<option value='ftp'><?=_('ftp'); ?></option>
727727
<option value='sftp' <?php if((!empty($v_backup_type)) && (trim($v_backup_type,"'") == 'sftp' )) echo 'selected="selected"'; ?>><?=_('sftp'); ?></option>
728-
<option value="b2" <?php if((!empty($v_backup_type)) && (trim($v_backup_type,"'") == 'b2' )) echo 'selected="selected"'; ?>><?=_('Backblaze '); ?>
728+
<option value="b2" <?php if((!empty($v_backup_type)) && (trim($v_backup_type,"'") == 'b2' )) echo 'selected="selected"'; ?>><?=_('Backblaze'); ?>
729729
</select>
730730
<br><br>
731731
</td>
@@ -1035,7 +1035,7 @@
10351035
</tr>
10361036
<tr>
10371037
<td class="vst-text input-label">
1038-
<?=_('Prevent CSRF ');?>
1038+
<?=_('Prevent CSRF');?>
10391039
</td>
10401040
</tr>
10411041
<tr>

0 commit comments

Comments
 (0)