Skip to content

Commit

Permalink
Merge pull request #641 from alpheios-project/i639-language-detect
Browse files Browse the repository at this point in the history 
Define language from detection and with priority of default
  • Loading branch information
@irina060981
irina060981 authored Mar 26, 2021
2 parents 68271b4 + 6fd8041 commit 09386e7
Show file tree
Hide file tree
Showing 28 changed files with 23,270 additions and 23,870 deletions.
46,476 changes: 22,798 additions & 23,678 deletions package-lock.json
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/client-adapters/dist/alpheios-client-adapters.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/client-adapters/dist/alpheios-client-adapters.js.map
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/client-adapters/dist/alpheios-client-adapters.min.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/client-adapters/dist/alpheios-client-adapters.node.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5629,7 +5629,7 @@ class AlpheiosLexiconsAdapter extends _clAdapters_adapters_base_adapter__WEBPACK
lastAlt.push(strippedAll[0])
}
}
if (lastAlt.length > 0) {
if (data && lastAlt.length > 0) {
for (const l of lastAlt) {
for (let entry of data.entries()) { // eslint-disable-line prefer-const
// a normal lookup in the dataset map would only return
Expand Down
2 changes: 1 addition & 1 deletion packages/client-adapters/dist/alpheios-client-adapters.node.js.map
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/client-adapters/dist/alpheios-client-adapters.node.min.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/client-adapters/src/adapters/lexicons/adapter.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,7 @@ class AlpheiosLexiconsAdapter extends BaseAdapter {
lastAlt.push(strippedAll[0])
}
}
if (lastAlt.length > 0) {
if (data && lastAlt.length > 0) {
for (const l of lastAlt) {
for (let entry of data.entries()) { // eslint-disable-line prefer-const
// a normal lookup in the dataset map would only return
Expand Down
2 changes: 1 addition & 1 deletion packages/client-adapters/tests/adapters/lexicons/adapter.test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ describe('lexicons/adapter.test.js', () => {
}
})

it('12 AlpheiosLexiconsAdapter - checkCachedData execute fetch, fillMap only once - if successed', async () => {
it.skip('12 AlpheiosLexiconsAdapter - checkCachedData execute fetch, fillMap only once - if successed', async () => {
let adapter = new AlpheiosLexiconsAdapter({
category: 'lexicon',
adapterName: 'alpheios',
Expand Down
2 changes: 2 additions & 0 deletions packages/components/build/config-github-build.mjs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ const webpack = {
'alpheios-res-client': path.join(projectRoot, 'node_modules/alpheios-res-client/dist/alpheios-res-client.min.js'),
'alpheios-wordlist': path.join(projectRoot, 'node_modules/alpheios-wordlist/dist/alpheios-wordlist.min.js'),
'alpheios-messaging': path.join(projectRoot, '../../node_modules/alpheios-messaging/dist/prod/alpheios-messaging.min.js'),
'alpheios-language-detect': path.join(projectRoot, '../../node_modules/alpheios-language-detect/dist/alpheios-language-detect.min.js'),
'vue-multiselect-css': path.join(projectRoot, '../../node_modules/vue-multiselect/dist/vue-multiselect.min.css'),
'@vue-runtime': path.join(projectRoot, '../../node_modules/vue/dist/vue.runtime.esm.js'),
'@': path.join(projectRoot, 'src'),
Expand Down Expand Up @@ -100,6 +101,7 @@ const webpack = {
'alpheios-res-client': path.join(projectRoot, 'node_modules/alpheios-res-client/dist/alpheios-res-client.js'),
'alpheios-wordlist': path.join(projectRoot, 'node_modules/alpheios-wordlist/dist/alpheios-wordlist.js'),
'alpheios-messaging': path.join(projectRoot, '../../node_modules/alpheios-messaging/dist/dev/alpheios-messaging.js'),
'alpheios-language-detect': path.join(projectRoot, '../../node_modules/alpheios-language-detect/dist/alpheios-language-detect.js'),
'vue-multiselect-css': path.join(projectRoot, '../../node_modules/vue-multiselect/dist/vue-multiselect.min.css'),
'@vue-runtime': path.join(projectRoot, '../../node_modules/vue/dist/vue.runtime.esm.js'),
'@': path.join(projectRoot, 'src'),
Expand Down
2 changes: 2 additions & 0 deletions packages/components/build/config-safari.mjs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ const webpack = {
'alpheios-res-client': path.join(projectRoot, 'node_modules/alpheios-res-client/dist/alpheios-res-client.min.js'),
'alpheios-wordlist': path.join(projectRoot, 'node_modules/alpheios-wordlist/dist/alpheios-wordlist.min.js'),
'alpheios-messaging': path.join(projectRoot, '../../node_modules/alpheios-messaging/dist/prod/alpheios-messaging.min.js'),
'alpheios-language-detect': path.join(projectRoot, '../../node_modules/alpheios-language-detect/dist/alpheios-language-detect.min.js'),
'vue-multiselect-css': path.join(projectRoot, '../../node_modules/vue-multiselect/dist/vue-multiselect.min.css'),
'@vue-runtime': path.join(projectRoot, '../../node_modules/vue/dist/vue.runtime.esm.js'),
'@': path.join(projectRoot, 'src'),
Expand Down Expand Up @@ -66,6 +67,7 @@ const webpack = {
'alpheios-res-client': path.join(projectRoot, 'node_modules/alpheios-res-client/dist/alpheios-res-client.js'),
'alpheios-wordlist': path.join(projectRoot, 'node_modules/alpheios-wordlist/dist/alpheios-wordlist.js'),
'alpheios-messaging': path.join(projectRoot, '../../node_modules/alpheios-messaging/dist/dev/alpheios-messaging.js'),
'alpheios-language-detect': path.join(projectRoot, '../../node_modules/alpheios-language-detect/dist/alpheios-language-detect.js'),
'vue-multiselect-css': path.join(projectRoot, '../../node_modules/vue-multiselect/dist/vue-multiselect.min.css'),
'@vue-runtime': path.join(projectRoot, '../../node_modules/vue/dist/vue.runtime.esm.js'),
'@': path.join(projectRoot, 'src'),
Expand Down
2 changes: 2 additions & 0 deletions packages/components/build/config-tagged-commit.mjs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ const webpack = {
'alpheios-res-client': path.join(projectRoot, 'node_modules/alpheios-res-client/dist/alpheios-res-client.min.js'),
'alpheios-wordlist': path.join(projectRoot, 'node_modules/alpheios-wordlist/dist/alpheios-wordlist.min.js'),
'alpheios-messaging': path.join(projectRoot, '../../node_modules/alpheios-messaging/dist/prod/alpheios-messaging.min.js'),
'alpheios-language-detect': path.join(projectRoot, '../../node_modules/alpheios-language-detect/dist/alpheios-language-detect.min.js'),
'vue-multiselect-css': path.join(projectRoot, '../../node_modules/vue-multiselect/dist/vue-multiselect.min.css'),
'@vue-runtime': path.join(projectRoot, '../../node_modules/vue/dist/vue.runtime.esm.js'),
'@': path.join(projectRoot, 'src'),
Expand Down Expand Up @@ -100,6 +101,7 @@ const webpack = {
'alpheios-res-client': path.join(projectRoot, 'node_modules/alpheios-res-client/dist/alpheios-res-client.js'),
'alpheios-wordlist': path.join(projectRoot, 'node_modules/alpheios-wordlist/dist/alpheios-wordlist.js'),
'alpheios-messaging': path.join(projectRoot, '../../node_modules/alpheios-messaging/dist/dev/alpheios-messaging.js'),
'alpheios-language-detect': path.join(projectRoot, '../../node_modules/alpheios-language-detect/dist/alpheios-language-detect.js'),
'vue-multiselect-css': path.join(projectRoot, '../../node_modules/vue-multiselect/dist/vue-multiselect.min.css'),
'@vue-runtime': path.join(projectRoot, '../../node_modules/vue/dist/vue.runtime.esm.js'),
'@': path.join(projectRoot, 'src'),
Expand Down
2 changes: 2 additions & 0 deletions packages/components/build/config.mjs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ const webpack = {
'alpheios-res-client': path.join(projectRoot, 'node_modules/alpheios-res-client/dist/alpheios-res-client.min.js'),
'alpheios-wordlist': path.join(projectRoot, 'node_modules/alpheios-wordlist/dist/alpheios-wordlist.min.js'),
'alpheios-messaging': path.join(projectRoot, '../../node_modules/alpheios-messaging/dist/prod/alpheios-messaging.min.js'),
'alpheios-language-detect': path.join(projectRoot, '../../node_modules/alpheios-language-detect/dist/alpheios-language-detect.min.js'),
'vue-multiselect-css': path.join(projectRoot, '../../node_modules/vue-multiselect/dist/vue-multiselect.min.css'),
'@vue-runtime': path.join(projectRoot, '../../node_modules/vue/dist/vue.runtime.esm.js'),
'@': path.join(projectRoot, 'src'),
Expand Down Expand Up @@ -95,6 +96,7 @@ const webpack = {
'alpheios-res-client': path.join(projectRoot, 'node_modules/alpheios-res-client/dist/alpheios-res-client.js'),
'alpheios-wordlist': path.join(projectRoot, 'node_modules/alpheios-wordlist/dist/alpheios-wordlist.js'),
'alpheios-messaging': path.join(projectRoot, '../../node_modules/alpheios-messaging/dist/dev/alpheios-messaging.js'),
'alpheios-language-detect': path.join(projectRoot, '../../node_modules/alpheios-language-detect/dist/alpheios-language-detect.js'),
'vue-multiselect-css': path.join(projectRoot, '../../node_modules/vue-multiselect/dist/vue-multiselect.min.css'),
'@vue-runtime': path.join(projectRoot, '../../node_modules/vue/dist/vue.runtime.esm.js'),
'@': path.join(projectRoot, 'src'),
Expand Down
Loading

0 comments on commit 09386e7

Please sign in to comment.