diff --git a/frontend/src/composables/useOilTranslation.js b/frontend/src/composables/useOilTranslation.js index 0cdcaea..8a12960 100644 --- a/frontend/src/composables/useOilTranslation.js +++ b/frontend/src/composables/useOilTranslation.js @@ -14,14 +14,27 @@ const OIL_EN = { '柠檬草': 'Lemongrass', '杜松浆果': 'Juniper Berry', '甜橙': 'Wild Orange', '香茅': 'Citronella', '薄荷': 'Peppermint', '扁柏': 'Arborvitae', '古巴香脂': 'Copaiba', '椰子油': 'Coconut Oil', - '芳香调理': 'AromaTouch', '保卫复方': 'On Guard', - '乐活复方': 'Balance', '舒缓复方': 'Past Tense', - '净化复方': 'Purify', '呼吸复方': 'Breathe', - '舒压复方': 'Adaptiv', '多特瑞': 'doTERRA', + '芳香调理': 'AromaTouch', '保卫复方': 'On Guard', '保卫': 'On Guard', + '乐活复方': 'Balance', '乐活': 'DigestZen', + '舒缓复方': 'Past Tense', '舒缓': 'Deep Blue', + '净化复方': 'Purify', '净化清新': 'Purify', + '呼吸复方': 'Breathe', '顺畅呼吸': 'Breathe', + '舒压复方': 'Adaptiv', '安定情绪': 'Balance', + '安宁神气': 'Serenity', '多特瑞': 'doTERRA', + '野橘': 'Wild Orange', '柑橘清新': 'Citrus Bliss', + '新瑞活力': 'MetaPWR', '元气': 'Zendocrine', + '温柔呵护': 'ClaryCalm', '西洋蓍草': 'Yarrow|Pom', + '西班牙牛至': 'Oregano', } export function oilEn(name) { - return OIL_EN[name] || '' + if (OIL_EN[name]) return OIL_EN[name] + // Try without common suffixes + const base = name.replace(/复方$|呵护$/, '') + if (base !== name && OIL_EN[base]) return OIL_EN[base] + // Try adding suffixes + if (OIL_EN[name + '复方']) return OIL_EN[name + '复方'] + return '' } export function recipeNameEn(name) { diff --git a/frontend/src/views/OilReference.vue b/frontend/src/views/OilReference.vue index e5ec392..bda5bff 100644 --- a/frontend/src/views/OilReference.vue +++ b/frontend/src/views/OilReference.vue @@ -134,16 +134,12 @@