Skip to content

Commit e342d59

Browse files
committed
Fix ampersand behavior in translated phrases
1 parent 4e3fe6e commit e342d59

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

Support/i18n-manager/Generate_i18n.vbp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ HelpContextID="0"
3434
CompatibleMode="0"
3535
MajorVer=2
3636
MinorVer=0
37-
RevisionVer=43
37+
RevisionVer=44
3838
AutoIncrementVer=1
3939
ServerSupportFiles=0
4040
VersionComments="i18n generator for PhotoDemon, www.photodemon.org"

Support/i18n-manager/frmGenerateI18N.frm

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -731,8 +731,9 @@ Private Sub cmdMergeAll_Click()
731731
'Old PhotoDemon language files used manually inserted & characters for keyboard accelerators.
732732
' Accelerators are now handled automatically on a per-language basis. To ensure work isn't lost
733733
' when upgrading these old files, strip any accelerators from the incoming text.
734-
If (InStr(1, origText, AMPERSAND_CHAR, vbBinaryCompare) <> 0) Then origText = Replace$(origText, AMPERSAND_CHAR, vbNullString, 1, -1, vbBinaryCompare)
735-
If (InStr(1, translatedText, AMPERSAND_CHAR, vbBinaryCompare) <> 0) Then origText = Replace$(translatedText, AMPERSAND_CHAR, vbNullString, 1, -1, vbBinaryCompare)
734+
' (As of 2024, this change is no longer necessary.)
735+
'If (InStr(1, origText, AMPERSAND_CHAR, vbBinaryCompare) <> 0) Then origText = Replace$(origText, AMPERSAND_CHAR, vbNullString, 1, -1, vbBinaryCompare)
736+
'If (InStr(1, translatedText, AMPERSAND_CHAR, vbBinaryCompare) <> 0) Then translatedText = Replace$(translatedText, AMPERSAND_CHAR, vbNullString, 1, -1, vbBinaryCompare)
736737

737738
If (LenB(translatedText) > 0) Then m_PhraseCollection.AddItem origText, translatedText
738739

0 commit comments

Comments
 (0)