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/ijekavica #206

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

Feat/ijekavica #206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5dcb766
feat: ijekavica demo
noomorph Feb 13, 2022
e1b4ffc
fixed typo
ru-danko Feb 23, 2022
955c616
added a setting that allows to select a variant of the orthography of…
ru-danko Mar 19, 2022
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
20,190 changes: 38 additions & 20,152 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions src/actions/actions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ export enum ActionTypes {
TOGGLE_PAGE = 'TOGGLE_PAGE',
SET_COMMUNITY_LINKS = 'SET_COMMUNITY_LINKS',
SET_BADGES = 'SET_BADGES',
CHANGE_SR_LANG_VARIANT = 'CHANGE_SR_LANG_VARIANT',
}

export function langAction(data: {from: string, to: string}) {
Expand Down Expand Up @@ -164,6 +165,13 @@ export function changeOrderOfCases(data) {
};
}

export function changeSrLangVariant(data) {
return {
type: ActionTypes.CHANGE_SR_LANG_VARIANT,
data,
};
}

export function changeDictionaryLangAction(data) {
return {
type: ActionTypes.DICTIONARY_LANGUAGES,
Expand Down
10 changes: 7 additions & 3 deletions src/components/Modals/TranslationsModal/TranslationsModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,22 @@ import { useDictionaryLanguages } from 'hooks/useDictionaryLanguages';
import { useInterfaceLang } from 'hooks/useInterfaceLang';
import { useModalDialog } from 'hooks/useModalDialog';
import { useResults } from 'hooks/useResults';
import { useSrLangVariant } from "hooks/useSrLangVariant";
import { getCyrillic } from 'utils/getCyrillic';
import { getLatin } from 'utils/getLatin';
import { srTransform } from "utils/srTransform";

import { Table } from 'components/Table';

import './TranslationsModal.scss';

function renderTranslate(str: string): string {
function renderTranslate(str: string, lang: string): string {
if (lang === 'sr') {
str = srTransform(str, useSrLangVariant());
}
if (str && str[0] === '!') {
return `{${str.slice(1)}}[s]@ts;`;
}

return `{✓}[g] ${str}@ts`;
}

Expand Down Expand Up @@ -82,7 +86,7 @@ export const TranslationsModal =
...arr,
[
`{${t(`${lang}Lang`)}}[B]@ts;b`,
renderTranslate(translate),
renderTranslate(translate, lang),
],
(
(lang === 'bg' && addLangsFiltered.length) ? (
Expand Down
31 changes: 30 additions & 1 deletion src/components/Pages/Settings/Settings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
changeDictionaryLangAction,
changeIsvSearchByWordForms,
changeIsvSearchLetters,
changeOrderOfCases,
changeOrderOfCases, changeSrLangVariant,
langAction,
setAlphabets,
setInterfaceLang,
Expand All @@ -30,6 +30,7 @@ import { useLang } from 'hooks/useLang';
import { useOrderOfCases } from 'hooks/useOrderOfCases';
import { useResults } from 'hooks/useResults';
import { useShortCardView } from 'hooks/useShortCardView';
import { useSrLangVariant } from 'hooks/useSrLangVariant';

import { Checkbox } from 'components/Checkbox';
import { Selector } from 'components/Selector';
Expand Down Expand Up @@ -100,6 +101,25 @@ const interfaceLanguageList = [
},
];

const srLangVariantList = [
{
name: 'Екавица, ћирилица',
value: 'ekavicaCyr'
},
{
name: 'Ијекавица, ћирилица',
value: 'ijekavicaCyr'
},
{
name: 'Ekavica, latinica',
value: 'ekavicaLat'
},
{
name: 'Ijekavica, latinica',
value: 'ijekavicaLat'
},
];

const orderOfCasesList = [
'nom,acc,gen,loc,dat,ins,voc',
'nom,acc,gen,dat,loc,ins,voc',
Expand All @@ -119,6 +139,7 @@ export const Settings =
const orderOfCases = useOrderOfCases();
const dictionaryLanguages = useDictionaryLanguages();
const enabledPages = useEnabledPages();
const srLangVariant = useSrLangVariant();
const { from, to } = useLang();
const [isLoading, setLoading] = useState(false);
useResults();
Expand Down Expand Up @@ -287,6 +308,14 @@ export const Settings =
})}
</div>
<hr />
<div>
<h6>{t('srLangVariant')}</h6>
<Selector
options={srLangVariantList}
value={srLangVariant}
onSelect={(srLangVariant:string) => dispatch(changeSrLangVariant(srLangVariant))}/>
</div>
<hr />
<div>
<h6>{t('devTools')}</h6>
<Checkbox
Expand Down
50 changes: 26 additions & 24 deletions src/components/Pages/Viewer/Viewer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,31 +85,33 @@ const customFilterParams = (field: string) => {
valueLowerCase = removeExclamationMark(valueLowerCase);
valueLowerCase = removeBrackets(valueLowerCase, '[', ']');
valueLowerCase = removeBrackets(valueLowerCase, '(', ')');

return Dictionary.splitWords(valueLowerCase).some((word) => {
const wordPrepared = Dictionary.searchPrepare(`${field}`, word);
switch (filter) {
case 'contains':
return wordPrepared.indexOf(filterTextLowerCase) >= 0;
case 'notContains':
return wordPrepared.indexOf(filterTextLowerCase) === -1;
case 'equals':
return wordPrepared === filterTextLowerCase;
case 'notEqual':
return wordPrepared !== filterTextLowerCase;
case 'startsWith':
return wordPrepared.indexOf(filterTextLowerCase) === 0;
case 'endsWith': {
const index = wordPrepared.lastIndexOf(filterTextLowerCase);

return index >= 0 && index === (wordPrepared.length - filterTextLowerCase.length);

return Dictionary
.splitWords(valueLowerCase)
.flatMap(word => Dictionary.searchPrepare(`${field}`, word))
.some((wordPrepared) => {
switch (filter) {
case 'contains':
return wordPrepared.indexOf(filterTextLowerCase) >= 0;
case 'notContains':
return wordPrepared.indexOf(filterTextLowerCase) === -1;
case 'equals':
return wordPrepared === filterTextLowerCase;
case 'notEqual':
return wordPrepared !== filterTextLowerCase;
case 'startsWith':
return wordPrepared.indexOf(filterTextLowerCase) === 0;
case 'endsWith': {
const index = wordPrepared.lastIndexOf(filterTextLowerCase);

return index >= 0 && index === (wordPrepared.length - filterTextLowerCase.length);
}
default:
// should never happen
// console.warn('invalid filter type ' + filter);
return false;
}
default:
// should never happen
// console.warn('invalid filter type ' + filter);
return false;
}
});
});
},
};
} else if (field === 'id') {
Expand Down
4 changes: 2 additions & 2 deletions src/consts.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@ export interface ITableData {

export const tablesData: ITableData[] = [
{
spreadsheetId: '1N79e_yVHDo-d026HljueuKJlAAdeELAiPzdFzdBuKbY',
sheetId: '1987833874',
spreadsheetId: '11TEUKt52TXnLbCvUWzSFK7zzDOzqsyHKw7dt2iZ0dD8',
sheetId: '947967899',
fields: basicFields,
},
{
Expand Down
9 changes: 9 additions & 0 deletions src/hooks/useSrLangVariant.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import { useSelector } from 'react-redux';

import { IMainState } from 'reducers';

export function useSrLangVariant() {
return useSelector((state: IMainState) => state.srLangVariant);
}


1 change: 1 addition & 0 deletions src/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ export const defaultState: IMainState = {
glagolitic: false,
},
orderOfCases: ['nom','acc','gen','loc','dat','ins','voc'],
srLangVariant: 'ekavicaCyr',
enabledPages: [],
communityLinks: [],
badges: [],
Expand Down
26 changes: 16 additions & 10 deletions src/reducers/reducers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ export interface IMainState {
rawResults: string[][];
results: ITranslateResult[];
alphabets: IAlphabets;
srLangVariant: string;
notification?: INotification;
modalDialog: IModalDialog;
orderOfCases: string[];
Expand Down Expand Up @@ -90,7 +91,7 @@ export function mainReducer(state: IMainState, { type, data }) {
...state,
lang,
rawResults,
results: Dictionary.formatTranslate(rawResults, lang.from, lang.to, flavorisationType, state.alphabets),
results: Dictionary.formatTranslate(rawResults, lang.from, lang.to, flavorisationType, state.alphabets, state.srLangVariant),
};
}
case ActionTypes.SEARCH_TYPE: {
Expand All @@ -110,7 +111,7 @@ export function mainReducer(state: IMainState, { type, data }) {
...state,
searchType,
rawResults,
results: Dictionary.formatTranslate(rawResults, lang.from, lang.to, flavorisationType, state.alphabets),
results: Dictionary.formatTranslate(rawResults, lang.from, lang.to, flavorisationType, state.alphabets, state.srLangVariant),
};
}
case ActionTypes.FROM_TEXT: {
Expand All @@ -130,7 +131,7 @@ export function mainReducer(state: IMainState, { type, data }) {
...state,
fromText,
rawResults,
results: Dictionary.formatTranslate(rawResults, lang.from, lang.to, flavorisationType, state.alphabets),
results: Dictionary.formatTranslate(rawResults, lang.from, lang.to, flavorisationType, state.alphabets, state.srLangVariant),
};
}
case ActionTypes.RUN_SEARCH: {
Expand All @@ -148,7 +149,7 @@ export function mainReducer(state: IMainState, { type, data }) {
return {
...state,
rawResults,
results: Dictionary.formatTranslate(rawResults, lang.from, lang.to, flavorisationType, state.alphabets),
results: Dictionary.formatTranslate(rawResults, lang.from, lang.to, flavorisationType, state.alphabets, state.srLangVariant),
};
}
case ActionTypes.CHANGE_ISV_SEARCH_LETTERS: {
Expand All @@ -168,7 +169,7 @@ export function mainReducer(state: IMainState, { type, data }) {
...state,
isvSearchLetters,
rawResults,
results: Dictionary.formatTranslate(rawResults, lang.from, lang.to, flavorisationType, state.alphabets),
results: Dictionary.formatTranslate(rawResults, lang.from, lang.to, flavorisationType, state.alphabets, state.srLangVariant),
};
}
case ActionTypes.CHANGE_ISV_SEARCH_BY_WORDFORMS: {
Expand All @@ -189,7 +190,7 @@ export function mainReducer(state: IMainState, { type, data }) {
...state,
isvSearchByWordForms,
rawResults,
results: Dictionary.formatTranslate(rawResults, lang.from, lang.to, flavorisationType, state.alphabets),
results: Dictionary.formatTranslate(rawResults, lang.from, lang.to, flavorisationType, state.alphabets, state.srLangVariant),
};
}
case ActionTypes.FLAVORISATION_TYPE: {
Expand All @@ -207,7 +208,7 @@ export function mainReducer(state: IMainState, { type, data }) {
return {
...state,
flavorisationType: data,
results: Dictionary.formatTranslate(rawResults, lang.from, lang.to, data, state.alphabets),
results: Dictionary.formatTranslate(rawResults, lang.from, lang.to, data, state.alphabets, state.srLangVariant),
};
}
case ActionTypes.POS_FILTER: {
Expand All @@ -225,7 +226,7 @@ export function mainReducer(state: IMainState, { type, data }) {
return {
...state,
posFilter: data,
results: Dictionary.formatTranslate(rawResults, lang.from, lang.to, flavorisationType, state.alphabets),
results: Dictionary.formatTranslate(rawResults, lang.from, lang.to, flavorisationType, state.alphabets, state.srLangVariant),
};
}
case ActionTypes.SET_PAGE:
Expand Down Expand Up @@ -318,17 +319,22 @@ export function mainReducer(state: IMainState, { type, data }) {
...state,
alphabets,
alphabetType,
results: Dictionary.formatTranslate(state.rawResults, state.lang.from, state.lang.to, state.flavorisationType, alphabets),
results: Dictionary.formatTranslate(state.rawResults, state.lang.from, state.lang.to, state.flavorisationType, alphabets, state.srLangVariant),
};
}
case ActionTypes.CHANGE_ORDER_OF_CASES:
return {
...state,
orderOfCases: data,
};
case ActionTypes.CHANGE_SR_LANG_VARIANT:
return {
...state,
srLangVariant: data,
results: Dictionary.formatTranslate(state.rawResults, state.lang.from, state.lang.to, state.flavorisationType, state.alphabets, data),
};
case ActionTypes.TOGGLE_PAGE: {
const { enabledPages } = state;

return {
...state,
enabledPages:
Expand Down
Loading