diff --git a/object/payment.go b/object/payment.go index 8db601a0..149d4051 100644 --- a/object/payment.go +++ b/object/payment.go @@ -35,7 +35,7 @@ type Payment struct { ProductName string `xorm:"varchar(100)" json:"productName"` ProductDisplayName string `xorm:"varchar(100)" json:"productDisplayName"` - Detail string `xorm:"varchar(100)" json:"detail"` + Detail string `xorm:"varchar(255)" json:"detail"` Tag string `xorm:"varchar(100)" json:"tag"` Currency string `xorm:"varchar(100)" json:"currency"` Price float64 `json:"price"` diff --git a/object/product.go b/object/product.go index 7b85f5b4..f4a822e6 100644 --- a/object/product.go +++ b/object/product.go @@ -28,7 +28,7 @@ type Product struct { DisplayName string `xorm:"varchar(100)" json:"displayName"` Image string `xorm:"varchar(100)" json:"image"` - Detail string `xorm:"varchar(100)" json:"detail"` + Detail string `xorm:"varchar(255)" json:"detail"` Tag string `xorm:"varchar(100)" json:"tag"` Currency string `xorm:"varchar(100)" json:"currency"` Price float64 `json:"price"` diff --git a/web/src/ProductBuyPage.js b/web/src/ProductBuyPage.js index 6ed7a952..58cfe161 100644 --- a/web/src/ProductBuyPage.js +++ b/web/src/ProductBuyPage.js @@ -160,10 +160,10 @@ class ProductBuyPage extends React.Component { - {product?.displayName} + {Setting.getLanguageText(product?.displayName)} - {product?.detail} + {Setting.getLanguageText(product?.detail)} {product?.tag} {product?.name} diff --git a/web/src/Setting.js b/web/src/Setting.js index 1b8c6e2e..08c580b6 100644 --- a/web/src/Setting.js +++ b/web/src/Setting.js @@ -544,6 +544,21 @@ export function getAvatarColor(s) { return colorList[hash % 4]; } +export function getLanguageText(text) { + if (!text.includes("|")) { + return text; + } + + let res; + const tokens = text.split("|"); + if (getLanguage() !== "zh") { + res = trim(tokens[0], ""); + } else { + res = trim(tokens[1], ""); + } + return res; +} + export function getLanguage() { return i18next.language; }