self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-10-31 00:07:48 +02:00
Code Issues Releases Activity

Merge branch 'master' of github.com:laurent22/joplin

Browse Source
This commit is contained in:
Laurent Cozic
2020-01-31 09:48:54 +00:00
parent 759d59c2e6 59c8a87047
commit d687ef5c09
5 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CliClient/locales/eo.po
View File

@@ -1,13 +1,13 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR Laurent Cozic
# This file is distributed under the same license as the Joplin-CLI package.
# Marton Paulo <martonpss@gmail.com>, 2019.
# Marton Paulo, 2019.
#
msgid ""
msgstr ""
"Project-Id-Version: Joplin-CLI 1.0.0\n"
"Report-Msgid-Bugs-To: \n"
"Last-Translator: Marton Paulo <martonpss@gmail.com>\n"
"Last-Translator: Marton Paulo\n"
"Language-Team: \n"
"Language: eo\n"
"MIME-Version: 1.0\n"

2
CliClient/locales/pt_BR.po
View File

@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Joplin-CLI 1.0.0\n"
"Report-Msgid-Bugs-To: \n"
"Last-Translator: Marton Paulo <martonpss@gmail.com>\n"
"Last-Translator: Marton Paulo\n"
"Language-Team: \n"
"Language: pt_BR\n"
"MIME-Version: 1.0\n"

10
CliClient/tests/services_SearchEngine.js
View File

@@ -258,6 +258,16 @@ describe('services_SearchEngine', function() {
expect((await engine.search('말')).length).toBe(1);
}));
it('should support queries with Thai characters', asyncTest(async () => {
let rows;
const n1 = await Note.save({ title: 'นี่คือคนไทย' });
await engine.syncTables();
expect((await engine.search('นี่คือค')).length).toBe(1);
expect((await engine.search('ไทย')).length).toBe(1);
}));
it('should support field restricted queries with Chinese characters', asyncTest(async () => {
let rows;
const n1 = await Note.save({ title: '你好', body: '我是法国人' });

2
ReactNativeClient/lib/services/SearchEngine.js
View File

@@ -386,7 +386,7 @@ class SearchEngine {
const st = scriptType(query);
if (!Setting.value('db.ftsEnabled') || ['ja', 'zh', 'ko'].indexOf(st) >= 0) {
if (!Setting.value('db.ftsEnabled') || ['ja', 'zh', 'ko', 'th'].indexOf(st) >= 0) {
// Non-alphabetical languages aren't support by SQLite FTS (except with extensions which are not available in all platforms)
return this.basicSearch(query);
} else {

2
ReactNativeClient/lib/string-utils.js
View File

@@ -267,6 +267,7 @@ function substrWithEllipsis(s, start, length) {
const REGEX_JAPANESE = /[\u3000-\u303f]|[\u3040-\u309f]|[\u30a0-\u30ff]|[\uff00-\uff9f]|[\u4e00-\u9faf]|[\u3400-\u4dbf]/;
const REGEX_CHINESE = /[\u4e00-\u9fff]|[\u3400-\u4dbf]|[\u{20000}-\u{2a6df}]|[\u{2a700}-\u{2b73f}]|[\u{2b740}-\u{2b81f}]|[\u{2b820}-\u{2ceaf}]|[\uf900-\ufaff]|[\u3300-\u33ff]|[\ufe30-\ufe4f]|[\uf900-\ufaff]|[\u{2f800}-\u{2fa1f}]/u;
const REGEX_KOREAN = /[\uac00-\ud7af]|[\u1100-\u11ff]|[\u3130-\u318f]|[\ua960-\ua97f]|[\ud7b0-\ud7ff]/;
const REGEX_THAI = /[\u0e00-\u0e7f]/;
function scriptType(s) {
// A string entirely with Chinese character will be detected as Japanese too
@@ -274,6 +275,7 @@ function scriptType(s) {
if (REGEX_CHINESE.test(s)) return 'zh';
if (REGEX_JAPANESE.test(s)) return 'ja';
if (REGEX_KOREAN.test(s)) return 'ko';
if (REGEX_THAI.test(s)) return 'th';
return 'en';
}