Skip to content

Commit f706cce

Browse files
committed
chore: Improve best-combination estimation note
1 parent 39aed15 commit f706cce

File tree

2 files changed

+22
-16
lines changed

2 files changed

+22
-16
lines changed

locales/en/translation.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
"Calculate": "Calculate",
4242
"Calculated Attributes": "Calculated Attributes",
4343
"Clear": "Clear",
44-
"Click here": "Click here",
4544
"Click the star icon to save a result for comparison.": "Click the star icon to save a result for comparison.",
4645
"Clone Critical Chance": "Clone Critical Chance",
4746
"Colors gear slots by whether they are the same as or different than the currently selected build. Useful for creating multiple builds that share some equipment.": "Colors gear slots by whether they are the same as or different than the currently selected build. Useful for creating multiple builds that share some equipment.",
@@ -87,7 +86,6 @@
8786
"Error: too much data!": "Error: too much data!",
8887
"Estimate best combinations": "Estimate best combinations",
8988
"Estimated Cost: <1></1>": "Estimated Cost: <1></1>",
90-
"Estimation may be incompatible with per-slot controls.": "Estimation may be incompatible with per-slot controls.",
9189
"Exotic weapons are not simulated correctly because of their reduced weapon strength. Adjust the power coefficient a bit less than 5% lower for more accurate results.": "Exotic weapons are not simulated correctly because of their reduced weapon strength. Adjust the power coefficient a bit less than 5% lower for more accurate results.",
9290
"Expert": "Expert",
9391
"Extra Modifiers": "Extra Modifiers",
@@ -136,6 +134,7 @@
136134
"Note: Some large calculations may take longer in Firefox.": "Note: Some large calculations may take longer in Firefox.",
137135
"Nourishment": "Nourishment",
138136
"Number of threads to use for calculations": "Number of threads to use for calculations",
137+
"Number to fully calculate": "Number to fully calculate",
139138
"Okay": "Okay",
140139
"Only the bonuses with checkboxes are applied here, so be sure to change the Skill Coefficients section when changing to/from traits without checkboxes like Lingering Curse or Legendary Lore for accurate results.": "Only the bonuses with checkboxes are applied here, so be sure to change the Skill Coefficients section when changing to/from traits without checkboxes like Lingering Curse or Legendary Lore for accurate results.",
141140
"Open build": "Open build",
@@ -144,6 +143,7 @@
144143
"Other": "Other",
145144
"Outgoing Healing": "Outgoing Healing",
146145
"Per-Slot Exclusions": "Per-Slot Exclusions",
146+
"Per-slot gear will be fully calculated for the number of chosen combinations. The rest will be estimated (e.g. \"80% berserker, 20% assassin\"). Enter zero to see only estimates!<br/><br/>Estimation may be incompatible with per-slot controls. <5>Click here</5> for more information.": "Per-slot gear will be fully calculated for the number of chosen combinations. The rest will be estimated (e.g. \"80% berserker, 20% assassin\"). Enter zero to see only estimates!<br/><br/>Estimation may be incompatible with per-slot controls. <5>Click here</5> for more information.",
147147
"Phantasm Critical Chance": "Phantasm Critical Chance",
148148
"Phantasm Critical Damage": "Phantasm Critical Damage",
149149
"Phantasm Effective Power": "Phantasm Effective Power",
@@ -216,7 +216,6 @@
216216
"Threads": "Threads",
217217
"Total Damage Multipliers": "Total Damage Multipliers",
218218
"Total Infusion Slots": "Total Infusion Slots",
219-
"Total to calculate": "Total to calculate",
220219
"Trait Template": "Trait Template",
221220
"Traitline": "Traitline {{ lineNr }}",
222221
"Traits": "Traits",
@@ -591,7 +590,6 @@
591590
"extraSubText_male": "male",
592591
"extraSubText_original": "original",
593592
"extraSubText_with quickness (7 hits)": "with quickness (7 hits)",
594-
"for more information.": "for more information.",
595593
"gw2combat project": "gw2combat project",
596594
"input the DPS values from a golem log here:": "input the DPS values from a golem log here:",
597595
"mult": "mult",

src/components/sections/extras/ExtrasSection.tsx

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/* eslint-disable react/no-unescaped-entities */
12
import { TextDivider } from '@discretize/react-discretize-components';
23
import InfoIcon from '@mui/icons-material/Info';
34
import {
@@ -11,7 +12,7 @@ import {
1112
Typography,
1213
} from '@mui/material';
1314
import React from 'react';
14-
import { useTranslation } from 'react-i18next';
15+
import { Trans, useTranslation } from 'react-i18next';
1516
import { useDispatch, useSelector } from 'react-redux';
1617
import type { PresetExtrasEntry } from '../../../assets/presetdata/metadata';
1718
import {
@@ -104,7 +105,7 @@ const ExtrasSection = () => {
104105
variant="standard"
105106
size="small"
106107
placeholder={String(Math.min(jsHeuristicsDefault, combinationCount))}
107-
label={t('Total to calculate')}
108+
label={t('Number to fully calculate')}
108109
slotProps={{
109110
input: {
110111
// used to always display the placeholder value instead of the label
@@ -127,7 +128,7 @@ const ExtrasSection = () => {
127128
<TextField
128129
variant="standard"
129130
size="small"
130-
label={t('Total to calculate')}
131+
label={t('Number to fully calculate')}
131132
slotProps={{
132133
input: {
133134
// must match above to fix weird animation on switch
@@ -162,15 +163,22 @@ const ExtrasSection = () => {
162163

163164
{jsHeuristicsEnabled && (
164165
<Info icon={<InfoIcon />}>
165-
{t('Estimation may be incompatible with per-slot controls.')}{' '}
166-
<Link
167-
href="https://github.com/discretize/discretize-gear-optimizer/discussions/805"
168-
target="_blank"
169-
rel="noopener"
170-
>
171-
{t('Click here')}
172-
</Link>{' '}
173-
{t('for more information.')}
166+
<Trans>
167+
Per-slot gear will be fully calculated for the number of chosen combinations. The
168+
rest will be estimated (e.g. "80% berserker, 20% assassin"). Enter zero to see
169+
only estimates!
170+
<br />
171+
<br />
172+
Estimation may be incompatible with per-slot controls.{' '}
173+
<Link
174+
href="https://github.com/discretize/discretize-gear-optimizer/discussions/805"
175+
target="_blank"
176+
rel="noopener"
177+
>
178+
Click here
179+
</Link>{' '}
180+
for more information.
181+
</Trans>
174182
</Info>
175183
)}
176184
</Box>

0 commit comments

Comments
 (0)