Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: translatable parts of speech #286

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

feat: translatable parts of speech #286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
6fd491c
feat: translatable parts of speech
noomorph May 22, 2024
5fd852d
Feat/pos translations (#287)
ru-danko May 22, 2024
6061bdb
chore: update package-lock
noomorph May 23, 2024
8ce12d6
change abbreviation display logic
noomorph May 23, 2024
0a88b82
i18n: translatable pos
noomorph Sep 19, 2024
e7a1233
Merge remote-tracking branch 'origin/master' into i18n/translatable-pos
ru-danko Nov 26, 2024
d68b08a
Merge branch 'i18n/translatable-pos' of https://github.com/sonic16x/i…
ru-danko Nov 26, 2024
615d545
merge fix
ru-danko Nov 26, 2024
d83ee71
merge fix
ru-danko Nov 26, 2024
fe14aa0
merge fixes
ru-danko Nov 26, 2024
9f646e2
dummy commit
noomorph Nov 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/components/Modals/DetailModal/DetailModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { t } from 'translations';
import { hideModalDialog, setAlphabetTypeAction } from 'actions';
import { IMainState } from 'reducers';

import { expandAbbr } from "utils/abbreviations";
import { getCaseTips } from 'utils/getCaseTips';
import { getCyrillic } from 'utils/getCyrillic';
import { getGlagolitic } from 'utils/getGlagolitic';
Expand Down Expand Up @@ -59,12 +60,14 @@ class DetailModalInternal extends Component<IDetailModalInternal> {
return null;
}

const pos = getPartOfSpeech(this.props.details);
const { word, add, details } = this.props;

return (
<>
<div className="modal-dialog__header">
{this.renderTitle(pos)}
<span className="modal-dialog__header-title">
{this.formatStr(word)} {this.formatStr(add)} <span className="details">({expandAbbr(details)})</span>
</span>
<button
className="modal-dialog__header-close"
onClick={this.props.close}
Expand Down
15 changes: 11 additions & 4 deletions src/components/ResultsCard/ResultsCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import { Dictionary, ITranslateResult } from 'services/dictionary';
import { useAlphabets } from 'hooks/useAlphabets';
import { useCaseQuestions } from 'hooks/useCaseQuestions';
import { useLang } from 'hooks/useLang';
import { expandAbbr, translateAbbr } from "utils/abbreviations";
import { getWordStatus } from "utils/getWordStatus";
import { toQueryString } from 'utils/toQueryString';
import { getPartOfSpeech } from 'utils/wordDetails';
Expand Down Expand Up @@ -82,7 +83,7 @@ function renderOriginal(item, alphabets, caseQuestions) {
{caseInfo && <span className="caseInfo">({caseInfo})</span>}
</span>
);
})}
})}
{!caseQuestions && item.caseInfo &&
<span className="caseInfo">(+{t(`case${item.caseInfo.slice(1)}`)})</span>
}
Expand Down Expand Up @@ -183,20 +184,26 @@ export const ResultsCard =
{item.to === 'isv' && short && (
<>
&nbsp;
<span className="results-card__details">{item.details}</span>
<abbr title={expandAbbr(item.details)} className="results-card__details">
{translateAbbr(item.details)}
</abbr>
</>
)}
</div>
{!short && (
<span className="results-card__details">{item.details}</span>
<abbr title={expandAbbr(item.details)} className="results-card__details">
{translateAbbr(item.details)}
</abbr>
)}
<div className="results-card__bottom">
<div className="results-card__original">
{item.to === 'isv' ? (
<Clipboard str={item.translate} />
) : renderOriginal(item, alphabets, caseQuestions)}
{item.to !== 'isv' && short && (
<span className="results-card__details">{item.details}</span>
<abbr title={expandAbbr(item.details)} className="results-card__details">
{translateAbbr(item.details)}
</abbr>
)}
</div>
<div className="results-card__actions">
Expand Down
Loading
Loading