mirror of https://github.com/laurent22/joplin.git
Merge branch 'dev' into mobile_profile_switcher
Laurent Cozic
GitHub
commit
42b219525c
|
|
@ -2319,15 +2319,27 @@ packages/tools/update-readme-sponsors.js.map
|
|||
packages/tools/updateMarkdownDoc.d.ts
|
||||
packages/tools/updateMarkdownDoc.js
|
||||
packages/tools/updateMarkdownDoc.js.map
|
||||
packages/tools/utils/translation.d.ts
|
||||
packages/tools/utils/translation.js
|
||||
packages/tools/utils/translation.js.map
|
||||
packages/tools/website/build.d.ts
|
||||
packages/tools/website/build.js
|
||||
packages/tools/website/build.js.map
|
||||
packages/tools/website/buildTranslations.d.ts
|
||||
packages/tools/website/buildTranslations.js
|
||||
packages/tools/website/buildTranslations.js.map
|
||||
packages/tools/website/updateDownloadPage.d.ts
|
||||
packages/tools/website/updateDownloadPage.js
|
||||
packages/tools/website/updateDownloadPage.js.map
|
||||
packages/tools/website/updateNews.d.ts
|
||||
packages/tools/website/updateNews.js
|
||||
packages/tools/website/updateNews.js.map
|
||||
packages/tools/website/utils/applyTranslations.d.ts
|
||||
packages/tools/website/utils/applyTranslations.js
|
||||
packages/tools/website/utils/applyTranslations.js.map
|
||||
packages/tools/website/utils/applyTranslations.test.d.ts
|
||||
packages/tools/website/utils/applyTranslations.test.js
|
||||
packages/tools/website/utils/applyTranslations.test.js.map
|
||||
packages/tools/website/utils/frontMatter.d.ts
|
||||
packages/tools/website/utils/frontMatter.js
|
||||
packages/tools/website/utils/frontMatter.js.map
|
||||
|
|
@ -2346,6 +2358,9 @@ packages/tools/website/utils/parser.js.map
|
|||
packages/tools/website/utils/pressCarousel.d.ts
|
||||
packages/tools/website/utils/pressCarousel.js
|
||||
packages/tools/website/utils/pressCarousel.js.map
|
||||
packages/tools/website/utils/processTranslations.d.ts
|
||||
packages/tools/website/utils/processTranslations.js
|
||||
packages/tools/website/utils/processTranslations.js.map
|
||||
packages/tools/website/utils/render.d.ts
|
||||
packages/tools/website/utils/render.js
|
||||
packages/tools/website/utils/render.js.map
|
||||
|
|
|
|||
|
|
@ -2307,15 +2307,27 @@ packages/tools/update-readme-sponsors.js.map
|
|||
packages/tools/updateMarkdownDoc.d.ts
|
||||
packages/tools/updateMarkdownDoc.js
|
||||
packages/tools/updateMarkdownDoc.js.map
|
||||
packages/tools/utils/translation.d.ts
|
||||
packages/tools/utils/translation.js
|
||||
packages/tools/utils/translation.js.map
|
||||
packages/tools/website/build.d.ts
|
||||
packages/tools/website/build.js
|
||||
packages/tools/website/build.js.map
|
||||
packages/tools/website/buildTranslations.d.ts
|
||||
packages/tools/website/buildTranslations.js
|
||||
packages/tools/website/buildTranslations.js.map
|
||||
packages/tools/website/updateDownloadPage.d.ts
|
||||
packages/tools/website/updateDownloadPage.js
|
||||
packages/tools/website/updateDownloadPage.js.map
|
||||
packages/tools/website/updateNews.d.ts
|
||||
packages/tools/website/updateNews.js
|
||||
packages/tools/website/updateNews.js.map
|
||||
packages/tools/website/utils/applyTranslations.d.ts
|
||||
packages/tools/website/utils/applyTranslations.js
|
||||
packages/tools/website/utils/applyTranslations.js.map
|
||||
packages/tools/website/utils/applyTranslations.test.d.ts
|
||||
packages/tools/website/utils/applyTranslations.test.js
|
||||
packages/tools/website/utils/applyTranslations.test.js.map
|
||||
packages/tools/website/utils/frontMatter.d.ts
|
||||
packages/tools/website/utils/frontMatter.js
|
||||
packages/tools/website/utils/frontMatter.js.map
|
||||
|
|
@ -2334,6 +2346,9 @@ packages/tools/website/utils/parser.js.map
|
|||
packages/tools/website/utils/pressCarousel.d.ts
|
||||
packages/tools/website/utils/pressCarousel.js
|
||||
packages/tools/website/utils/pressCarousel.js.map
|
||||
packages/tools/website/utils/processTranslations.d.ts
|
||||
packages/tools/website/utils/processTranslations.js
|
||||
packages/tools/website/utils/processTranslations.js.map
|
||||
packages/tools/website/utils/render.d.ts
|
||||
packages/tools/website/utils/render.js
|
||||
packages/tools/website/utils/render.js.map
|
||||
|
|
|
|||
|
|
@ -0,0 +1,2 @@
|
|||
*~
|
||||
WebsiteAssets/locales/*.mo
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 1.7 MiB |
|
|
@ -399,12 +399,12 @@ div.navbar-mobile-content a.sponsor-button {
|
|||
margin: auto;
|
||||
}
|
||||
|
||||
#top-section-img {
|
||||
.top-section-img {
|
||||
margin-bottom: -280px;
|
||||
margin-top: 40px;
|
||||
}
|
||||
|
||||
#top-section-img img {
|
||||
.top-section-img img {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
|
|
@ -910,7 +910,7 @@ footer .bottom-links-row p {
|
|||
padding-top: 80px;
|
||||
}
|
||||
|
||||
#top-section-img {
|
||||
.top-section-img {
|
||||
margin-bottom: -90px;
|
||||
margin-top: 50px;
|
||||
}
|
||||
|
|
@ -1154,7 +1154,7 @@ footer .bottom-links-row p {
|
|||
background-position: bottom;
|
||||
padding-bottom: 160px;
|
||||
}
|
||||
#top-section-img {
|
||||
.top-section-img {
|
||||
margin-bottom: -240px;
|
||||
margin-top: 130px;
|
||||
}
|
||||
|
|
@ -1182,3 +1182,25 @@ footer .bottom-links-row p {
|
|||
margin-top: -15p;
|
||||
}
|
||||
}
|
||||
|
||||
/*****************************************************************
|
||||
ENGLISH VERSION
|
||||
*****************************************************************/
|
||||
|
||||
:lang(en-gb) #made-in-france-section {
|
||||
display: none;
|
||||
}
|
||||
|
||||
:lang(en-gb) .top-section-img-cn {
|
||||
display: none;
|
||||
}
|
||||
|
||||
/*****************************************************************
|
||||
CHINESE VERSION
|
||||
*****************************************************************/
|
||||
|
||||
:lang(zh-cn) #in-the-press-section,
|
||||
:lang(zh-cn) #sponsors-section,
|
||||
:lang(zh-cn) .top-section-img-en {
|
||||
display: none;
|
||||
}
|
||||
|
|
|
|||
Binary file not shown.
|
After Width: | Height: | Size: 2.1 MiB |
Binary file not shown.
|
After Width: | Height: | Size: 149 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 320 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 582 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 57 KiB |
|
|
@ -0,0 +1,28 @@
|
|||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: \n"
|
||||
"POT-Creation-Date: \n"
|
||||
"PO-Revision-Date: \n"
|
||||
"Last-Translator: \n"
|
||||
"Language-Team: \n"
|
||||
"Language: fr_FR\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Generator: Poedit 3.0.1\n"
|
||||
|
||||
#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:63
|
||||
msgid "Download the app"
|
||||
msgstr "Télécharger l'application"
|
||||
|
||||
#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:54
|
||||
msgid "Free your <span class=\"frame-bg frame-bg-blue\">notes</span>"
|
||||
msgstr "Libérez vos <span class=\"frame-bg frame-bg-blue\">notes</span>"
|
||||
|
||||
#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:57
|
||||
msgid "Joplin is an open source note-taking app. Capture your thoughts and securely access them from any device."
|
||||
msgstr "Joplin est une application libre de prise de notes. Capturez vos pensées et accédez-y de façon sécurisé depuis n'importe quel appareil."
|
||||
|
||||
#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:65
|
||||
msgid "Sign up with Joplin Cloud"
|
||||
msgstr "S'inscrire sur Joplin Cloud"
|
||||
|
|
@ -0,0 +1,160 @@
|
|||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: \n"
|
||||
"POT-Creation-Date: \n"
|
||||
"PO-Revision-Date: \n"
|
||||
"Last-Translator: \n"
|
||||
"Language-Team: \n"
|
||||
"Language: zh_CN\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Generator: Poedit 3.0.1\n"
|
||||
|
||||
#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:192
|
||||
msgid "<span class=\"frame-bg frame-bg-yellow-lg\">Customise</span> it"
|
||||
msgstr "<span class=\"frame-bg frame-bg-yellow-lg\">定制</span>它 根据您的需要"
|
||||
|
||||
#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:91
|
||||
msgid "<span class=\"frame-bg frame-bg-yellow\">Multimedia</span> notes"
|
||||
msgstr "<span class=\"frame-bg frame-bg-yellow\">多媒体</span>说明"
|
||||
|
||||
#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:243
|
||||
msgid "100% <span class=\"frame-bg frame-bg-yellow-lg\">your data</span>"
|
||||
msgstr "百分之百<span class=\"frame-bg frame-bg-yellow-lg\">你的数据</span>"
|
||||
|
||||
#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:271
|
||||
msgid "A <span class=\"frame-bg frame-bg-yellow-lg\">French</span> Alternative"
|
||||
msgstr "一个<span class=\"frame-bg frame-bg-yellow-lg\">法国</span>的替代方案"
|
||||
|
||||
#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:223
|
||||
msgid ""
|
||||
"Access your notes from your computer, phone or tablet by synchronising with "
|
||||
"various services, including Joplin Cloud, Dropbox and OneDrive. The app is "
|
||||
"available on Windows, macOS, Linux, Android and iOS. A terminal app is also "
|
||||
"available!"
|
||||
msgstr ""
|
||||
"通过与各种服务同步，包括Joplin Cloud、Dropbox和OneDrive，从你的电脑、手机或平"
|
||||
"板电脑访问你的笔记。该应用程序可在Windows、macOS、Linux、Android和iOS上使用。"
|
||||
"终端应用也可使用!"
|
||||
|
||||
#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:195
|
||||
msgid ""
|
||||
"Customise the app with plugins, custom themes and multiple text editors "
|
||||
"(Rich Text or Markdown). Or create your own scripts and plugins using the "
|
||||
"Extension API."
|
||||
msgstr ""
|
||||
"用插件、自定义主题和多个文本编辑器（富文本或马克顿）来定制该应用程序。或者使"
|
||||
"用扩展API创建你自己的脚本和插件。"
|
||||
|
||||
#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:229
|
||||
msgid "Download it now"
|
||||
msgstr "下载该应用程序"
|
||||
|
||||
#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:63
|
||||
#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:99
|
||||
msgid "Download the app"
|
||||
msgstr "下载该应用程序"
|
||||
|
||||
#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:200
|
||||
msgid "Find out more"
|
||||
msgstr ""
|
||||
|
||||
#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:54
|
||||
msgid "Free your <span class=\"frame-bg frame-bg-blue\">notes</span>"
|
||||
msgstr "释放你的<span class=\"frame-bg frame-bg-blue\">笔记</span>"
|
||||
|
||||
#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:162
|
||||
msgid "Get the clipper"
|
||||
msgstr "获取剪子"
|
||||
|
||||
#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:94
|
||||
msgid ""
|
||||
"Images, videos, PDFs and audio files are supported. Create math expressions "
|
||||
"and diagrams directly from the app. Take photos with the mobile app and save "
|
||||
"them to a note."
|
||||
msgstr ""
|
||||
"Joplin，由于其起源和设计，适应并尊重中国的标准和规则。这保证了您的使用不受限"
|
||||
"制，以及您的使用数据的完全透明和安全。"
|
||||
|
||||
#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:288
|
||||
msgid "In the <span class=\"frame-bg frame-bg-yellow\">Press</span>"
|
||||
msgstr ""
|
||||
|
||||
#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:57
|
||||
msgid ""
|
||||
"Joplin is an open source note-taking app. Capture your thoughts and securely "
|
||||
"access them from any device."
|
||||
msgstr ""
|
||||
"Joplin是一个开源的记事本应用程序。捕捉你的想法并从任何设备上安全地访问它们。"
|
||||
|
||||
#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:274
|
||||
msgid ""
|
||||
"Joplin, due to its origin and design, adapts and respects Chinese standards "
|
||||
"and rules. This guarantees your unrestricted use and complete transparency "
|
||||
"and security of your usage data."
|
||||
msgstr ""
|
||||
"Joplin，由于其起源和设计，适应并尊重中国的标准和规则。这保证了您的使用不受限"
|
||||
"制，以及您的使用数据的完全透明和安全。"
|
||||
|
||||
#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:249
|
||||
msgid "More about E2EE"
|
||||
msgstr ""
|
||||
|
||||
#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:352
|
||||
msgid "Our <span class=\"frame-bg frame-bg-blue-lg\">sponsors</span>"
|
||||
msgstr ""
|
||||
|
||||
#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:154
|
||||
msgid ""
|
||||
"Save <span class=\"frame-bg frame-bg-blue\">web pages</span> <br>as notes"
|
||||
msgstr "保存<span class=\"frame-bg frame-bg-blue\">网页</span> <br>作为笔记"
|
||||
|
||||
#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:65
|
||||
msgid "Sign up with Joplin Cloud"
|
||||
msgstr "与乔布林云签约"
|
||||
|
||||
#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:355
|
||||
msgid "Thank you for your support!"
|
||||
msgstr ""
|
||||
|
||||
#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:244
|
||||
msgid ""
|
||||
"The app is open source and your notes are saved to an open format, so you'll "
|
||||
"always have access to them. Uses End-To-End Encryption (E2EE) to secure your "
|
||||
"notes and ensure no-one but yourself can access them."
|
||||
msgstr ""
|
||||
"该应用程序是开源的，你的笔记被保存为开放的格式，所以你将永远可以访问它们。使"
|
||||
"用端对端加密（E2EE）来保护你的笔记，确保除了你自己之外没有人可以访问它们。"
|
||||
|
||||
#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:131
|
||||
msgid "Try it now"
|
||||
msgstr "现在就试试吧"
|
||||
|
||||
#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:157
|
||||
msgid ""
|
||||
"Use the web clipper extension, available on Chrome and Firefox, to save web "
|
||||
"pages or take screenshots as notes."
|
||||
msgstr "使用Chrome和Firefox上的web clipper扩展，可以保存网页或截图作为笔记。"
|
||||
|
||||
#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:125
|
||||
msgid ""
|
||||
"With Joplin Cloud, share your notes with your friends, family or colleagues "
|
||||
"and collaborate on them."
|
||||
msgstr "通过乔普林云，与你的朋友、家人或同事分享你的笔记，并进行合作。"
|
||||
|
||||
#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:124
|
||||
msgid "Work <span class=\"frame-bg frame-bg-yellow\">together</span>"
|
||||
msgstr "<span class=\"frame-bg frame-bg-yellow\">一起</span>工作"
|
||||
|
||||
#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:128
|
||||
msgid ""
|
||||
"You can also publish a note to the internet and share the URL with others."
|
||||
msgstr ""
|
||||
|
||||
#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:220
|
||||
msgid ""
|
||||
"Your notes, <span class=\"frame-bg frame-bg-blue-lg\">everywhere</span> you "
|
||||
"are"
|
||||
msgstr ""
|
||||
"你的笔记<span class=\"frame-bg frame-bg-blue-lg\">你在哪里都可以</span>"
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<html lang="en-gb">
|
||||
<head>
|
||||
{{> gtmHead}}
|
||||
{{> gaOptimize}}
|
||||
|
|
@ -51,22 +51,22 @@
|
|||
Running in {{env}} mode!
|
||||
</div>
|
||||
|
||||
<h1 class="text-center">
|
||||
<h1 translate class="text-center">
|
||||
Free your <span class="frame-bg frame-bg-blue">notes</span>
|
||||
</h1>
|
||||
<p class="text-center" id="top-section-text">
|
||||
<p translate class="text-center" id="top-section-text">
|
||||
Joplin is an open source note-taking app. Capture your thoughts and securely access them from any device.
|
||||
</p>
|
||||
<br />
|
||||
<br />
|
||||
<p class="text-center">
|
||||
<a href="{{baseUrl}}/download/" class="button-link btn-blue download-button">Download the app</a>
|
||||
<a translate href="{{baseUrl}}/download/" class="button-link btn-blue download-button">Download the app</a>
|
||||
{{#showJoplinCloudLinks}}
|
||||
<a href="{{baseUrl}}/plans/" class="button-link btn-trans plans-button">Sign up with Joplin Cloud</a>
|
||||
<a translate href="{{baseUrl}}/plans/" class="button-link btn-trans plans-button">Sign up with Joplin Cloud</a>
|
||||
{{/showJoplinCloudLinks}}
|
||||
</p>
|
||||
|
||||
<picture class="img-fluid img-center" id="top-section-img">
|
||||
<picture class="img-fluid img-center top-section-img top-section-img-en">
|
||||
<source type="image/webp" srcset="
|
||||
{{imageBaseUrl}}/home-top-img-4x.webp 4820w,
|
||||
{{imageBaseUrl}}/home-top-img-2x.webp 2388w,
|
||||
|
|
@ -76,7 +76,20 @@
|
|||
{{imageBaseUrl}}/home-top-img-2x.png 2388w,
|
||||
{{imageBaseUrl}}/home-top-img.png 1205w
|
||||
">
|
||||
<img id="top-section-img-img" src="{{imageBaseUrl}}/home-top-img-2x.png">
|
||||
<img src="{{imageBaseUrl}}/home-top-img-2x.png">
|
||||
</picture>
|
||||
|
||||
<picture class="img-fluid img-center top-section-img top-section-img-cn">
|
||||
<source type="image/webp" srcset="
|
||||
{{imageBaseUrl}}/home-top-img-cn-4x.webp 4820w,
|
||||
{{imageBaseUrl}}/home-top-img-cn-2x.webp 2388w,
|
||||
{{imageBaseUrl}}/home-top-img-cn.webp 1205w
|
||||
">
|
||||
<source type="image/png" srcset="
|
||||
{{imageBaseUrl}}/home-top-img-cn-2x.png 2388w,
|
||||
{{imageBaseUrl}}/home-top-img-cn.png 1205w
|
||||
">
|
||||
<img src="{{imageBaseUrl}}/home-top-img-cn-2x.png">
|
||||
</picture>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -88,17 +101,15 @@
|
|||
<div class="row">
|
||||
<div class="col-12 col-md-5 col-xxl-6">
|
||||
<div class="ml-30 ml-mobile-0">
|
||||
<h2 id="multimedia-title">
|
||||
<h2 translate id="multimedia-title">
|
||||
<span class="frame-bg frame-bg-yellow">Multimedia</span> notes
|
||||
</h2>
|
||||
<p id="multimedia-text">
|
||||
Images, videos, PDFs and audio files are supported. Create
|
||||
math expressions and diagrams directly from the app. Take
|
||||
photos with the mobile app and save them to a note.
|
||||
<p translate id="multimedia-text">
|
||||
Images, videos, PDFs and audio files are supported. Create math expressions and diagrams directly from the app. Take photos with the mobile app and save them to a note.
|
||||
</p>
|
||||
<br />
|
||||
<p>
|
||||
<a href="{{baseUrl}}/download/" class="button-link btn-blue">Download the app</a>
|
||||
<a translate href="{{baseUrl}}/download/" class="button-link btn-blue">Download the app</a>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -123,15 +134,14 @@
|
|||
<div class="col-6 d-none d-md-block"></div>
|
||||
<div class="col-12 col-md-6">
|
||||
<div class="ml-30 ml-mobile-0">
|
||||
<h2>Work <span class="frame-bg frame-bg-yellow">together</span></h2>
|
||||
<p>
|
||||
With Joplin Cloud, share your notes with your friends, family
|
||||
or colleagues and collaborate on them.
|
||||
<h2 translate>Work <span class="frame-bg frame-bg-yellow">together</span></h2>
|
||||
<p translate>
|
||||
With Joplin Cloud, share your notes with your friends, family or colleagues and collaborate on them.
|
||||
</p>
|
||||
<p>You can also publish a note to the internet and share the URL with others.</p>
|
||||
<p translate>You can also publish a note to the internet and share the URL with others.</p>
|
||||
<br/>
|
||||
<p>
|
||||
<a href="{{baseUrl}}/plans/" class="button-link btn-blue">Try it now</a>
|
||||
<a translate href="{{baseUrl}}/plans/" class="button-link btn-blue">Try it now</a>
|
||||
</p>
|
||||
<br class="d-block d-md-none" />
|
||||
<br class="d-block d-md-none" />
|
||||
|
|
@ -154,16 +164,15 @@
|
|||
<div class="row">
|
||||
<div class="col-12 col-md-6">
|
||||
<div class="ml-30 ml-mobile-0">
|
||||
<h2 id="save-web-title">
|
||||
<h2 translate id="save-web-title">
|
||||
Save <span class="frame-bg frame-bg-blue">web pages</span> <br />as notes
|
||||
</h2>
|
||||
<p>
|
||||
Use the web clipper extension, available on Chrome and
|
||||
Firefox, to save web pages or take screenshots as notes.
|
||||
<p translate>
|
||||
Use the web clipper extension, available on Chrome and Firefox, to save web pages or take screenshots as notes.
|
||||
</p>
|
||||
<br />
|
||||
<p>
|
||||
<a href="{{baseUrl}}/clipper/" class="button-link btn-blue">Get the clipper</a>
|
||||
<a translate href="{{baseUrl}}/clipper/" class="button-link btn-blue">Get the clipper</a>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -193,19 +202,15 @@
|
|||
</div>
|
||||
<div class="col-12 col-md-6">
|
||||
<div class="ml-30 ml-mobile-0">
|
||||
<h2 id="customise-it-title">
|
||||
<h2 translate id="customise-it-title">
|
||||
<span class="frame-bg frame-bg-yellow-lg">Customise</span> it
|
||||
<br />
|
||||
to your needs
|
||||
</h2>
|
||||
<p>
|
||||
Customise the app with plugins, custom themes and multiple
|
||||
text editors (Rich Text or Markdown). Or create your own
|
||||
scripts and plugins using the Extension API.
|
||||
<p translate>
|
||||
Customise the app with plugins, custom themes and multiple text editors (Rich Text or Markdown). Or create your own scripts and plugins using the Extension API.
|
||||
</p>
|
||||
<br />
|
||||
<p>
|
||||
<a href="{{baseUrl}}/help/#plugins" class="button-link btn-blue">Find out more</a>
|
||||
<a translate href="{{baseUrl}}/help/#plugins" class="button-link btn-blue">Find out more</a>
|
||||
</p>
|
||||
|
||||
<br class="d-block d-lg-none" />
|
||||
|
|
@ -225,16 +230,16 @@
|
|||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-12">
|
||||
<h2 class="text-center">
|
||||
<h2 translate class="text-center">
|
||||
Your notes, <span class="frame-bg frame-bg-blue-lg">everywhere</span> you are
|
||||
</h2>
|
||||
<p class="text-center" id="your-note-text">
|
||||
<p translate class="text-center" id="your-note-text">
|
||||
Access your notes from your computer, phone or tablet by synchronising with various services, including Joplin Cloud, Dropbox and OneDrive. The app is available on Windows, macOS, Linux, Android and iOS. A terminal app is also available!
|
||||
</p>
|
||||
<br />
|
||||
<br />
|
||||
<p class="text-center">
|
||||
<a href="{{baseUrl}}/download/" class="button-link btn-blue">Download it now</a>
|
||||
<a translate href="{{baseUrl}}/download/" class="button-link btn-blue">Download it now</a>
|
||||
</p>
|
||||
<br />
|
||||
</div>
|
||||
|
|
@ -248,15 +253,13 @@
|
|||
<div class="col-12 col-md-6">
|
||||
<br class="d-block d-md-none" />
|
||||
<div class="ml-30 ml-mobile-0">
|
||||
<h2>100% <span class="frame-bg frame-bg-yellow-lg">your data</span></h2>
|
||||
<p>
|
||||
The app is open source and your notes are saved to an open
|
||||
format, so you'll always have access to them. Uses End-To-End Encryption (E2EE) to secure your notes and ensure no-one but
|
||||
yourself can access them.
|
||||
<h2 translate>100% <span class="frame-bg frame-bg-yellow-lg">your data</span></h2>
|
||||
<p translate>
|
||||
The app is open source and your notes are saved to an open format, so you'll always have access to them. Uses End-To-End Encryption (E2EE) to secure your notes and ensure no-one but yourself can access them.
|
||||
</p>
|
||||
<br />
|
||||
<p>
|
||||
<a href="{{baseUrl}}/e2ee/" class="button-link btn-blue">More about E2EE</a>
|
||||
<a translate href="{{baseUrl}}/e2ee/" class="button-link btn-blue">More about E2EE</a>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -274,12 +277,28 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div id="made-in-france-section" class="blue-bg">
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-12">
|
||||
<h2 translate class="text-center">
|
||||
A <span class="frame-bg frame-bg-yellow-lg">French</span> Alternative
|
||||
</h2>
|
||||
<p translate class="text-center">
|
||||
Joplin, due to its origin and design, adapts and respects Chinese standards and rules. This guarantees your unrestricted use and complete transparency and security of your usage data.
|
||||
</p>
|
||||
<br /><br /><br /><br />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="in-the-press-section">
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-12">
|
||||
<br />
|
||||
<h2 class="text-center">
|
||||
<h2 translate class="text-center">
|
||||
In the <span class="frame-bg frame-bg-yellow">Press</span>
|
||||
</h2>
|
||||
<br />
|
||||
|
|
@ -343,10 +362,10 @@
|
|||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-12">
|
||||
<h2 class="text-center">
|
||||
<h2 translate class="text-center">
|
||||
Our <span class="frame-bg frame-bg-blue-lg">sponsors</span>
|
||||
</h2>
|
||||
<p class="text-center" id="your-note-text">
|
||||
<p translate class="text-center" id="your-note-text">
|
||||
Thank you for your support!
|
||||
</p>
|
||||
<br />
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<html lang="en-gb">
|
||||
|
||||
<!--
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,112 @@
|
|||
msgid ""
|
||||
msgstr ""
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
|
||||
#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:192
|
||||
msgid "<span class=\"frame-bg frame-bg-yellow-lg\">Customise</span> it"
|
||||
msgstr ""
|
||||
|
||||
#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:91
|
||||
msgid "<span class=\"frame-bg frame-bg-yellow\">Multimedia</span> notes"
|
||||
msgstr ""
|
||||
|
||||
#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:243
|
||||
msgid "100% <span class=\"frame-bg frame-bg-yellow-lg\">your data</span>"
|
||||
msgstr ""
|
||||
|
||||
#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:271
|
||||
msgid "A <span class=\"frame-bg frame-bg-yellow-lg\">French</span> Alternative"
|
||||
msgstr ""
|
||||
|
||||
#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:223
|
||||
msgid "Access your notes from your computer, phone or tablet by synchronising with various services, including Joplin Cloud, Dropbox and OneDrive. The app is available on Windows, macOS, Linux, Android and iOS. A terminal app is also available!"
|
||||
msgstr ""
|
||||
|
||||
#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:195
|
||||
msgid "Customise the app with plugins, custom themes and multiple text editors (Rich Text or Markdown). Or create your own scripts and plugins using the Extension API."
|
||||
msgstr ""
|
||||
|
||||
#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:229
|
||||
msgid "Download it now"
|
||||
msgstr ""
|
||||
|
||||
#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:63
|
||||
#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:99
|
||||
msgid "Download the app"
|
||||
msgstr ""
|
||||
|
||||
#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:200
|
||||
msgid "Find out more"
|
||||
msgstr ""
|
||||
|
||||
#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:54
|
||||
msgid "Free your <span class=\"frame-bg frame-bg-blue\">notes</span>"
|
||||
msgstr ""
|
||||
|
||||
#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:162
|
||||
msgid "Get the clipper"
|
||||
msgstr ""
|
||||
|
||||
#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:94
|
||||
msgid "Images, videos, PDFs and audio files are supported. Create math expressions and diagrams directly from the app. Take photos with the mobile app and save them to a note."
|
||||
msgstr ""
|
||||
|
||||
#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:288
|
||||
msgid "In the <span class=\"frame-bg frame-bg-yellow\">Press</span>"
|
||||
msgstr ""
|
||||
|
||||
#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:57
|
||||
msgid "Joplin is an open source note-taking app. Capture your thoughts and securely access them from any device."
|
||||
msgstr ""
|
||||
|
||||
#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:274
|
||||
msgid "Joplin, due to its origin and design, adapts and respects Chinese standards and rules. This guarantees your unrestricted use and complete transparency and security of your usage data."
|
||||
msgstr ""
|
||||
|
||||
#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:249
|
||||
msgid "More about E2EE"
|
||||
msgstr ""
|
||||
|
||||
#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:352
|
||||
msgid "Our <span class=\"frame-bg frame-bg-blue-lg\">sponsors</span>"
|
||||
msgstr ""
|
||||
|
||||
#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:154
|
||||
msgid "Save <span class=\"frame-bg frame-bg-blue\">web pages</span> <br>as notes"
|
||||
msgstr ""
|
||||
|
||||
#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:65
|
||||
msgid "Sign up with Joplin Cloud"
|
||||
msgstr ""
|
||||
|
||||
#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:355
|
||||
msgid "Thank you for your support!"
|
||||
msgstr ""
|
||||
|
||||
#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:244
|
||||
msgid "The app is open source and your notes are saved to an open format, so you'll always have access to them. Uses End-To-End Encryption (E2EE) to secure your notes and ensure no-one but yourself can access them."
|
||||
msgstr ""
|
||||
|
||||
#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:131
|
||||
msgid "Try it now"
|
||||
msgstr ""
|
||||
|
||||
#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:157
|
||||
msgid "Use the web clipper extension, available on Chrome and Firefox, to save web pages or take screenshots as notes."
|
||||
msgstr ""
|
||||
|
||||
#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:125
|
||||
msgid "With Joplin Cloud, share your notes with your friends, family or colleagues and collaborate on them."
|
||||
msgstr ""
|
||||
|
||||
#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:124
|
||||
msgid "Work <span class=\"frame-bg frame-bg-yellow\">together</span>"
|
||||
msgstr ""
|
||||
|
||||
#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:128
|
||||
msgid "You can also publish a note to the internet and share the URL with others."
|
||||
msgstr ""
|
||||
|
||||
#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:220
|
||||
msgid "Your notes, <span class=\"frame-bg frame-bg-blue-lg\">everywhere</span> you are"
|
||||
msgstr ""
|
||||
|
|
@ -6,15 +6,9 @@
|
|||
],
|
||||
"settings": {
|
||||
"files.exclude": {
|
||||
".yarn": true,
|
||||
"lerna-debug.log": true,
|
||||
"_mydocs/mdtest/": true,
|
||||
"./packages/lib/plugin_types": true,
|
||||
"_releases/": true,
|
||||
"_vieux/": true,
|
||||
".gitignore": true,
|
||||
".eslintignore": true,
|
||||
"**/*.jpl": true,
|
||||
"./packages/app-cli/**/*.*~": true,
|
||||
"./packages/app-cli/**/*.mo": true,
|
||||
"./packages/app-cli/**/build/": true,
|
||||
|
|
@ -103,26 +97,32 @@
|
|||
"./packages/app-mobile/fastlane/Preview.html": true,
|
||||
"./packages/app-mobile/fastlane/report.xml": true,
|
||||
"./packages/app-mobile/fastlane/screenshots": true,
|
||||
"./packages/renderer/**/.vscode/": true,
|
||||
"./packages/renderer/**/copyLib.bat": true,
|
||||
"./packages/renderer/**/node_modules/": true,
|
||||
"./packages/app-tools/**/*-kct.*": true,
|
||||
"./packages/app-tools/**/github_username_cache.json": true,
|
||||
"./packages/app-tools/**/patreon_oauth_token.txt": true,
|
||||
"./packages/lib/plugin_types": true,
|
||||
"./packages/renderer/**/.vscode/": true,
|
||||
"./packages/renderer/**/copyLib.bat": true,
|
||||
"./packages/renderer/**/node_modules/": true,
|
||||
".eslintignore": true,
|
||||
".gitignore": true,
|
||||
".vscode/*": true,
|
||||
".yarn": true,
|
||||
"*.sublime-workspace": true,
|
||||
"**/_mydocs": true,
|
||||
"**/_mydocs/EnexSamples/*.enex": true,
|
||||
"**/_releases": true,
|
||||
"**/_vieux/": true,
|
||||
"**/.DS_Store": true,
|
||||
"**/*?.js": { "when": "$(basename).tsx"},
|
||||
"**/*.base64": true,
|
||||
"**/*~": true,
|
||||
"**/*.bundle.js": true,
|
||||
"**/*.eot": true,
|
||||
"**/*.icns": true,
|
||||
"**/*.ico": true,
|
||||
"**/*.jar": true,
|
||||
"**/*.jpl": true,
|
||||
"**/*.js": {"when": "$(basename).ts"},
|
||||
"**/*.map": true,
|
||||
"**/*.min.css": true,
|
||||
"**/*.min.js": true,
|
||||
|
|
@ -135,6 +135,7 @@
|
|||
"**/*.ttf": true,
|
||||
"**/*.woff": true,
|
||||
"**/*.woff2": true,
|
||||
"**/*~": true,
|
||||
"**/app/data/uploads/": true,
|
||||
"**/Clipper-source/": true,
|
||||
"**/docs/*.html": true,
|
||||
|
|
@ -171,11 +172,13 @@
|
|||
"app/config/parameters.yml": true,
|
||||
"app/data/uploads/.gitkeep": false,
|
||||
"Assets/DownloadBadges*.psd": true,
|
||||
"Assets/TinyMCE/langs": true,
|
||||
"Assets/WebsiteAssets/locales/*.mo": true,
|
||||
"build/": true,
|
||||
"docs/": true,
|
||||
"docs/images/flags": true,
|
||||
"lerna-debug.log": true,
|
||||
"node_modules/": true,
|
||||
"Assets/TinyMCE/langs": true,
|
||||
"packages/app-cli/**/*.*~": true,
|
||||
"packages/app-cli/**/*.mo": true,
|
||||
"packages/app-cli/**/build/": true,
|
||||
|
|
@ -224,7 +227,6 @@
|
|||
"packages/app-cli/tests/support/plugins/toc/**/dist/": true,
|
||||
"packages/app-cli/tests/sync/": true,
|
||||
"packages/app-cli/tests/tmp/": true,
|
||||
"packages/htmlpack/dist/": true,
|
||||
"packages/app-clipper/**/dist/": true,
|
||||
"packages/app-clipper/content_scripts/**/*.bundle.js": true,
|
||||
"packages/app-clipper/dist/": true,
|
||||
|
|
@ -250,7 +252,6 @@
|
|||
"packages/app-desktop/**/pluginAssets/": true,
|
||||
"packages/app-desktop/build/icons/": true,
|
||||
"packages/app-desktop/build/images/": true,
|
||||
"packages/app-desktop/vendor/lib/": true,
|
||||
"packages/app-desktop/dist/": true,
|
||||
"packages/app-desktop/fonts/": true,
|
||||
"packages/app-desktop/gui/note-viewer/highlight/styles/": true,
|
||||
|
|
@ -258,6 +259,7 @@
|
|||
"packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/supportedLocales.js": true,
|
||||
"packages/app-desktop/lib/": true,
|
||||
"packages/app-desktop/locale/": true,
|
||||
"packages/app-desktop/vendor/lib/": true,
|
||||
"packages/app-mobile/**/.DS_Store": true,
|
||||
"packages/app-mobile/**/.gradle": true,
|
||||
"packages/app-mobile/**/.idea": true,
|
||||
|
|
@ -305,6 +307,16 @@
|
|||
"packages/app-mobile/fastlane/screenshots": true,
|
||||
"packages/app-mobile/ios/build/": true,
|
||||
"packages/app-mobile/lib/csstojs/": true,
|
||||
"packages/app-mobile/lib/rnInjectedJs/": true,
|
||||
"packages/app-mobile/lib/sql-extensions/spellfix.so": true,
|
||||
"packages/app-mobile/node_modules/": true,
|
||||
"packages/app-tools/**/*-kct.*": true,
|
||||
"packages/app-tools/**/github_username_cache.json": true,
|
||||
"packages/app-tools/**/patreon_oauth_token.txt": true,
|
||||
"packages/app-tools/commit_hook.txt": true,
|
||||
"packages/app-tools/github_oauth_token.txt": true,
|
||||
"packages/generator-joplin/generators/app/templates/api/": true,
|
||||
"packages/htmlpack/dist/": true,
|
||||
"packages/renderer/**/.vscode/": true,
|
||||
"packages/renderer/**/copyLib.bat": true,
|
||||
"packages/renderer/**/node_modules/": true,
|
||||
|
|
@ -312,22 +324,13 @@
|
|||
"packages/renderer/MdToHtml/rules/fence.js": true,
|
||||
"packages/renderer/MdToHtml/rules/mermaid.js": true,
|
||||
"packages/renderer/MdToHtml/rules/sanitize_html.js": true,
|
||||
"packages/app-mobile/lib/rnInjectedJs/": true,
|
||||
"packages/app-mobile/lib/sql-extensions/spellfix.so": true,
|
||||
"packages/server/dist/": true,
|
||||
"packages/server/db-*.sqlite": true,
|
||||
"packages/server/test.pid": true,
|
||||
"packages/server/dist/": true,
|
||||
"packages/server/temp": true,
|
||||
"packages/generator-joplin/generators/app/templates/api/": true,
|
||||
"packages/app-mobile/node_modules/": true,
|
||||
"packages/server/test.pid": true,
|
||||
"phpunit.xml": true,
|
||||
"Server/db*.sqlite/": true,
|
||||
"Server/dist/": true,
|
||||
"packages/app-tools/**/*-kct.*": true,
|
||||
"packages/app-tools/**/github_username_cache.json": true,
|
||||
"packages/app-tools/**/patreon_oauth_token.txt": true,
|
||||
"packages/app-tools/commit_hook.txt": true,
|
||||
"packages/app-tools/github_oauth_token.txt": true,
|
||||
"var/*": true,
|
||||
"var/cache": false,
|
||||
"var/cache/.gitkeep": false,
|
||||
|
|
@ -342,8 +345,6 @@
|
|||
"vendor/": true,
|
||||
"web/bundles/": true,
|
||||
"web/env.php": true,
|
||||
"**/*.js": {"when": "$(basename).ts"},
|
||||
"**/*?.js": { "when": "$(basename).tsx"},
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -21,6 +21,7 @@
|
|||
"updateNews": "node ./packages/tools/website/updateNews",
|
||||
"buildSettingJsonSchema": "yarn workspace joplin start settingschema ../../../joplin-website/docs/schema/settings.json",
|
||||
"buildTranslations": "node packages/tools/build-translation.js",
|
||||
"buildWebsiteTranslations": "node packages/tools/website/buildTranslations.js",
|
||||
"buildWebsite": "node ./packages/tools/website/build.js && yarn run buildPluginDoc && yarn run buildSettingJsonSchema",
|
||||
"checkLibPaths": "node ./packages/tools/checkLibPaths.js",
|
||||
"circularDependencyCheck": "madge --warning --circular --extensions js ./",
|
||||
|
|
@ -63,8 +64,8 @@
|
|||
},
|
||||
"devDependencies": {
|
||||
"@seiyab/eslint-plugin-react-hooks": "4.5.1-beta.0",
|
||||
"@typescript-eslint/eslint-plugin": "5.43.0",
|
||||
"@typescript-eslint/parser": "5.43.0",
|
||||
"@typescript-eslint/eslint-plugin": "5.44.0",
|
||||
"@typescript-eslint/parser": "5.44.0",
|
||||
"cspell": "5.21.2",
|
||||
"eslint": "8.28.0",
|
||||
"eslint-interactive": "10.2.0",
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@
|
|||
"dependencies": {
|
||||
"@joplin/lib": "~2.9",
|
||||
"@joplin/renderer": "~2.9",
|
||||
"aws-sdk": "2.1258.0",
|
||||
"aws-sdk": "2.1261.0",
|
||||
"chalk": "4.1.2",
|
||||
"compare-version": "0.1.2",
|
||||
"fs-extra": "10.1.0",
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
<img src=""/>
|
||||
<img src=""/>
|
||||
<img src/>
|
||||
<img src/>
|
||||
|
|
@ -1,2 +1,2 @@
|
|||
<img src="" class="jop-noMdConv"/>
|
||||
<img src="" class="jop-noMdConv"/>
|
||||
<img src class="jop-noMdConv"/>
|
||||
<img src class="jop-noMdConv"/>
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<html lang="en-gb">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
|
||||
|
|
|
|||
|
|
@ -149,7 +149,7 @@
|
|||
"electron-window-state": "5.0.3",
|
||||
"formatcoords": "1.1.3",
|
||||
"fs-extra": "10.1.0",
|
||||
"highlight.js": "11.6.0",
|
||||
"highlight.js": "11.7.0",
|
||||
"immer": "7.0.15",
|
||||
"keytar": "7.9.0",
|
||||
"mark.js": "8.11.1",
|
||||
|
|
@ -166,7 +166,7 @@
|
|||
"react-redux": "8.0.5",
|
||||
"react-select": "5.6.1",
|
||||
"react-toggle-button": "2.2.0",
|
||||
"react-tooltip": "4.5.0",
|
||||
"react-tooltip": "4.5.1",
|
||||
"redux": "4.2.0",
|
||||
"reselect": "4.1.7",
|
||||
"roboto-fontface": "0.10.0",
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@ PODS:
|
|||
- JoplinCommonShareExtension (1.0.0)
|
||||
- JoplinRNShareExtension (1.0.0):
|
||||
- JoplinCommonShareExtension
|
||||
- React
|
||||
- RCT-Folly (2021.06.28.00-v2):
|
||||
- boost
|
||||
- DoubleConversion
|
||||
|
|
@ -514,7 +515,7 @@ SPEC CHECKSUMS:
|
|||
fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
|
||||
glog: 85ecdd10ee8d8ec362ef519a6a45ff9aa27b2e85
|
||||
JoplinCommonShareExtension: 270b4f8eb4e22828eeda433a04ed689fc1fd09b5
|
||||
JoplinRNShareExtension: 82ca54510de96ab4db96cbdd17303e7af4c12ff0
|
||||
JoplinRNShareExtension: 9cd07431e525b36344fcecfaeecff974efc78528
|
||||
RCT-Folly: 803a9cfd78114b2ec0f140cfa6fa2a6bafb2d685
|
||||
RCTRequired: cd47794163052d2b8318c891a7a14fcfaccc75ab
|
||||
RCTTypeSafety: 393bb40b3e357b224cde53d3fec26813c52428b1
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@ Pod::Spec.new do |spec|
|
|||
spec.platform = :ios, "9.0"
|
||||
spec.source = { :path => "." }
|
||||
spec.source_files = "Source/RNShareExtension/**/*.{h,m}"
|
||||
# Should hopefully work with any React version
|
||||
# spec.dependency "React", "0.66.1"
|
||||
spec.dependency "React"
|
||||
spec.dependency "JoplinCommonShareExtension"
|
||||
end
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@
|
|||
"react-native-url-polyfill": "1.3.0",
|
||||
"react-native-vector-icons": "9.2.0",
|
||||
"react-native-version-info": "1.1.1",
|
||||
"react-native-webview": "11.23.1",
|
||||
"react-native-webview": "11.24.0",
|
||||
"react-redux": "8.0.5",
|
||||
"redux": "4.2.0",
|
||||
"rn-fetch-blob": "0.12.0",
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
module.exports = `LyoKCkF0b20gT25lIERhcmsgV2l0aCBzdXBwb3J0IGZvciBSZWFzb25NTCBieSBHaWRpIE1vcnJpcywgYmFzZWQgb2ZmIHdvcmsgYnkgRGFuaWVsIEdhbWFnZQoKT3JpZ2luYWwgT25lIERhcmsgU3ludGF4IHRoZW1lIGZyb20gaHR0cHM6Ly9naXRodWIuY29tL2F0b20vb25lLWRhcmstc3ludGF4CgoqLwouaGxqcyB7CiAgY29sb3I6ICNhYmIyYmY7CiAgYmFja2dyb3VuZDogIzI4MmMzNDsKfQouaGxqcy1rZXl3b3JkLCAuaGxqcy1vcGVyYXRvciB7CiAgY29sb3I6ICNGOTI2NzI7Cn0KLmhsanMtcGF0dGVybi1tYXRjaCB7CiAgY29sb3I6ICNGOTI2NzI7Cn0KLmhsanMtcGF0dGVybi1tYXRjaCAuaGxqcy1jb25zdHJ1Y3RvciB7CiAgY29sb3I6ICM2MWFlZWU7Cn0KLmhsanMtZnVuY3Rpb24gewogIGNvbG9yOiAjNjFhZWVlOwp9Ci5obGpzLWZ1bmN0aW9uIC5obGpzLXBhcmFtcyB7CiAgY29sb3I6ICNBNkUyMkU7Cn0KLmhsanMtZnVuY3Rpb24gLmhsanMtcGFyYW1zIC5obGpzLXR5cGluZyB7CiAgY29sb3I6ICNGRDk3MUY7Cn0KLmhsanMtbW9kdWxlLWFjY2VzcyAuaGxqcy1tb2R1bGUgewogIGNvbG9yOiAjN2U1N2MyOwp9Ci5obGpzLWNvbnN0cnVjdG9yIHsKICBjb2xvcjogI2UyYjkzZDsKfQouaGxqcy1jb25zdHJ1Y3RvciAuaGxqcy1zdHJpbmcgewogIGNvbG9yOiAjOUNDQzY1Owp9Ci5obGpzLWNvbW1lbnQsIC5obGpzLXF1b3RlIHsKICBjb2xvcjogI2IxOGViMTsKICBmb250LXN0eWxlOiBpdGFsaWM7Cn0KLmhsanMtZG9jdGFnLCAuaGxqcy1mb3JtdWxhIHsKICBjb2xvcjogI2M2NzhkZDsKfQouaGxqcy1zZWN0aW9uLCAuaGxqcy1uYW1lLCAuaGxqcy1zZWxlY3Rvci10YWcsIC5obGpzLWRlbGV0aW9uLCAuaGxqcy1zdWJzdCB7CiAgY29sb3I6ICNlMDZjNzU7Cn0KLmhsanMtbGl0ZXJhbCB7CiAgY29sb3I6ICM1NmI2YzI7Cn0KLmhsanMtc3RyaW5nLCAuaGxqcy1yZWdleHAsIC5obGpzLWFkZGl0aW9uLCAuaGxqcy1hdHRyaWJ1dGUsIC5obGpzLW1ldGEgLmhsanMtc3RyaW5nIHsKICBjb2xvcjogIzk4YzM3OTsKfQouaGxqcy1idWlsdF9pbiwKLmhsanMtdGl0bGUuY2xhc3NfLAouaGxqcy1jbGFzcyAuaGxqcy10aXRsZSB7CiAgY29sb3I6ICNlNmMwN2I7Cn0KLmhsanMtYXR0ciwgLmhsanMtdmFyaWFibGUsIC5obGpzLXRlbXBsYXRlLXZhcmlhYmxlLCAuaGxqcy10eXBlLCAuaGxqcy1zZWxlY3Rvci1jbGFzcywgLmhsanMtc2VsZWN0b3ItYXR0ciwgLmhsanMtc2VsZWN0b3ItcHNldWRvLCAuaGxqcy1udW1iZXIgewogIGNvbG9yOiAjZDE5YTY2Owp9Ci5obGpzLXN5bWJvbCwgLmhsanMtYnVsbGV0LCAuaGxqcy1saW5rLCAuaGxqcy1tZXRhLCAuaGxqcy1zZWxlY3Rvci1pZCwgLmhsanMtdGl0bGUgewogIGNvbG9yOiAjNjFhZWVlOwp9Ci5obGpzLWVtcGhhc2lzIHsKICBmb250LXN0eWxlOiBpdGFsaWM7Cn0KLmhsanMtc3Ryb25nIHsKICBmb250LXdlaWdodDogYm9sZDsKfQouaGxqcy1saW5rIHsKICB0ZXh0LWRlY29yYXRpb246IHVuZGVybGluZTsKfQo=`;
|
||||
module.exports = `cHJlIGNvZGUuaGxqc3tkaXNwbGF5OmJsb2NrO292ZXJmbG93LXg6YXV0bztwYWRkaW5nOjFlbX1jb2RlLmhsanN7cGFkZGluZzozcHggNXB4fS5obGpze2NvbG9yOiNhYmIyYmY7YmFja2dyb3VuZDojMjgyYzM0fS5obGpzLWtleXdvcmQsLmhsanMtb3BlcmF0b3IsLmhsanMtcGF0dGVybi1tYXRjaHtjb2xvcjojZjkyNjcyfS5obGpzLWZ1bmN0aW9uLC5obGpzLXBhdHRlcm4tbWF0Y2ggLmhsanMtY29uc3RydWN0b3J7Y29sb3I6IzYxYWVlZX0uaGxqcy1mdW5jdGlvbiAuaGxqcy1wYXJhbXN7Y29sb3I6I2E2ZTIyZX0uaGxqcy1mdW5jdGlvbiAuaGxqcy1wYXJhbXMgLmhsanMtdHlwaW5ne2NvbG9yOiNmZDk3MWZ9LmhsanMtbW9kdWxlLWFjY2VzcyAuaGxqcy1tb2R1bGV7Y29sb3I6IzdlNTdjMn0uaGxqcy1jb25zdHJ1Y3Rvcntjb2xvcjojZTJiOTNkfS5obGpzLWNvbnN0cnVjdG9yIC5obGpzLXN0cmluZ3tjb2xvcjojOWNjYzY1fS5obGpzLWNvbW1lbnQsLmhsanMtcXVvdGV7Y29sb3I6I2IxOGViMTtmb250LXN0eWxlOml0YWxpY30uaGxqcy1kb2N0YWcsLmhsanMtZm9ybXVsYXtjb2xvcjojYzY3OGRkfS5obGpzLWRlbGV0aW9uLC5obGpzLW5hbWUsLmhsanMtc2VjdGlvbiwuaGxqcy1zZWxlY3Rvci10YWcsLmhsanMtc3Vic3R7Y29sb3I6I2UwNmM3NX0uaGxqcy1saXRlcmFse2NvbG9yOiM1NmI2YzJ9LmhsanMtYWRkaXRpb24sLmhsanMtYXR0cmlidXRlLC5obGpzLW1ldGEgLmhsanMtc3RyaW5nLC5obGpzLXJlZ2V4cCwuaGxqcy1zdHJpbmd7Y29sb3I6Izk4YzM3OX0uaGxqcy1idWlsdF9pbiwuaGxqcy1jbGFzcyAuaGxqcy10aXRsZSwuaGxqcy10aXRsZS5jbGFzc197Y29sb3I6I2U2YzA3Yn0uaGxqcy1hdHRyLC5obGpzLW51bWJlciwuaGxqcy1zZWxlY3Rvci1hdHRyLC5obGpzLXNlbGVjdG9yLWNsYXNzLC5obGpzLXNlbGVjdG9yLXBzZXVkbywuaGxqcy10ZW1wbGF0ZS12YXJpYWJsZSwuaGxqcy10eXBlLC5obGpzLXZhcmlhYmxle2NvbG9yOiNkMTlhNjZ9LmhsanMtYnVsbGV0LC5obGpzLWxpbmssLmhsanMtbWV0YSwuaGxqcy1zZWxlY3Rvci1pZCwuaGxqcy1zeW1ib2wsLmhsanMtdGl0bGV7Y29sb3I6IzYxYWVlZX0uaGxqcy1lbXBoYXNpc3tmb250LXN0eWxlOml0YWxpY30uaGxqcy1zdHJvbmd7Zm9udC13ZWlnaHQ6NzAwfS5obGpzLWxpbmt7dGV4dC1kZWNvcmF0aW9uOnVuZGVybGluZX0=`;
|
||||
|
|
@ -1 +1 @@
|
|||
module.exports = `LyoKCkF0b20gT25lIExpZ2h0IGJ5IERhbmllbCBHYW1hZ2UKT3JpZ2luYWwgT25lIExpZ2h0IFN5bnRheCB0aGVtZSBmcm9tIGh0dHBzOi8vZ2l0aHViLmNvbS9hdG9tL29uZS1saWdodC1zeW50YXgKCmJhc2U6ICAgICNmYWZhZmEKbW9uby0xOiAgIzM4M2E0Mgptb25vLTI6ICAjNjg2Yjc3Cm1vbm8tMzogICNhMGExYTcKaHVlLTE6ICAgIzAxODRiYgpodWUtMjogICAjNDA3OGYyCmh1ZS0zOiAgICNhNjI2YTQKaHVlLTQ6ICAgIzUwYTE0ZgpodWUtNTogICAjZTQ1NjQ5Cmh1ZS01LTI6ICNjOTEyNDMKaHVlLTY6ICAgIzk4NjgwMQpodWUtNi0yOiAjYzE4NDAxCgoqLwoKLmhsanMgewogIGNvbG9yOiAjMzgzYTQyOwogIGJhY2tncm91bmQ6ICNmYWZhZmE7Cn0KCi5obGpzLWNvbW1lbnQsCi5obGpzLXF1b3RlIHsKICBjb2xvcjogI2EwYTFhNzsKICBmb250LXN0eWxlOiBpdGFsaWM7Cn0KCi5obGpzLWRvY3RhZywKLmhsanMta2V5d29yZCwKLmhsanMtZm9ybXVsYSB7CiAgY29sb3I6ICNhNjI2YTQ7Cn0KCi5obGpzLXNlY3Rpb24sCi5obGpzLW5hbWUsCi5obGpzLXNlbGVjdG9yLXRhZywKLmhsanMtZGVsZXRpb24sCi5obGpzLXN1YnN0IHsKICBjb2xvcjogI2U0NTY0OTsKfQoKLmhsanMtbGl0ZXJhbCB7CiAgY29sb3I6ICMwMTg0YmI7Cn0KCi5obGpzLXN0cmluZywKLmhsanMtcmVnZXhwLAouaGxqcy1hZGRpdGlvbiwKLmhsanMtYXR0cmlidXRlLAouaGxqcy1tZXRhIC5obGpzLXN0cmluZyB7CiAgY29sb3I6ICM1MGExNGY7Cn0KCi5obGpzLWF0dHIsCi5obGpzLXZhcmlhYmxlLAouaGxqcy10ZW1wbGF0ZS12YXJpYWJsZSwKLmhsanMtdHlwZSwKLmhsanMtc2VsZWN0b3ItY2xhc3MsCi5obGpzLXNlbGVjdG9yLWF0dHIsCi5obGpzLXNlbGVjdG9yLXBzZXVkbywKLmhsanMtbnVtYmVyIHsKICBjb2xvcjogIzk4NjgwMTsKfQoKLmhsanMtc3ltYm9sLAouaGxqcy1idWxsZXQsCi5obGpzLWxpbmssCi5obGpzLW1ldGEsCi5obGpzLXNlbGVjdG9yLWlkLAouaGxqcy10aXRsZSB7CiAgY29sb3I6ICM0MDc4ZjI7Cn0KCi5obGpzLWJ1aWx0X2luLAouaGxqcy10aXRsZS5jbGFzc18sCi5obGpzLWNsYXNzIC5obGpzLXRpdGxlIHsKICBjb2xvcjogI2MxODQwMTsKfQoKLmhsanMtZW1waGFzaXMgewogIGZvbnQtc3R5bGU6IGl0YWxpYzsKfQoKLmhsanMtc3Ryb25nIHsKICBmb250LXdlaWdodDogYm9sZDsKfQoKLmhsanMtbGluayB7CiAgdGV4dC1kZWNvcmF0aW9uOiB1bmRlcmxpbmU7Cn0K`;
|
||||
module.exports = `cHJlIGNvZGUuaGxqc3tkaXNwbGF5OmJsb2NrO292ZXJmbG93LXg6YXV0bztwYWRkaW5nOjFlbX1jb2RlLmhsanN7cGFkZGluZzozcHggNXB4fS5obGpze2NvbG9yOiMzODNhNDI7YmFja2dyb3VuZDojZmFmYWZhfS5obGpzLWNvbW1lbnQsLmhsanMtcXVvdGV7Y29sb3I6I2EwYTFhNztmb250LXN0eWxlOml0YWxpY30uaGxqcy1kb2N0YWcsLmhsanMtZm9ybXVsYSwuaGxqcy1rZXl3b3Jke2NvbG9yOiNhNjI2YTR9LmhsanMtZGVsZXRpb24sLmhsanMtbmFtZSwuaGxqcy1zZWN0aW9uLC5obGpzLXNlbGVjdG9yLXRhZywuaGxqcy1zdWJzdHtjb2xvcjojZTQ1NjQ5fS5obGpzLWxpdGVyYWx7Y29sb3I6IzAxODRiYn0uaGxqcy1hZGRpdGlvbiwuaGxqcy1hdHRyaWJ1dGUsLmhsanMtbWV0YSAuaGxqcy1zdHJpbmcsLmhsanMtcmVnZXhwLC5obGpzLXN0cmluZ3tjb2xvcjojNTBhMTRmfS5obGpzLWF0dHIsLmhsanMtbnVtYmVyLC5obGpzLXNlbGVjdG9yLWF0dHIsLmhsanMtc2VsZWN0b3ItY2xhc3MsLmhsanMtc2VsZWN0b3ItcHNldWRvLC5obGpzLXRlbXBsYXRlLXZhcmlhYmxlLC5obGpzLXR5cGUsLmhsanMtdmFyaWFibGV7Y29sb3I6Izk4NjgwMX0uaGxqcy1idWxsZXQsLmhsanMtbGluaywuaGxqcy1tZXRhLC5obGpzLXNlbGVjdG9yLWlkLC5obGpzLXN5bWJvbCwuaGxqcy10aXRsZXtjb2xvcjojNDA3OGYyfS5obGpzLWJ1aWx0X2luLC5obGpzLWNsYXNzIC5obGpzLXRpdGxlLC5obGpzLXRpdGxlLmNsYXNzX3tjb2xvcjojYzE4NDAxfS5obGpzLWVtcGhhc2lze2ZvbnQtc3R5bGU6aXRhbGljfS5obGpzLXN0cm9uZ3tmb250LXdlaWdodDo3MDB9LmhsanMtbGlua3t0ZXh0LWRlY29yYXRpb246dW5kZXJsaW5lfQ==`;
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
module.exports = {
|
||||
hash:"abde4aa0d823e75ca24be9dd0e8c971a", files: {
|
||||
hash:"edb511738c14143467cc859e46bd6121", files: {
|
||||
'highlight.js/atom-one-dark-reasonable.css': { data: require('./highlight.js/atom-one-dark-reasonable.css.base64.js'), mime: 'text/css', encoding: 'base64' },
|
||||
'highlight.js/atom-one-light.css': { data: require('./highlight.js/atom-one-light.css.base64.js'), mime: 'text/css', encoding: 'base64' },
|
||||
'katex/fonts/KaTeX_AMS-Regular.woff2': { data: require('./katex/fonts/KaTeX_AMS-Regular.woff2.base64.js'), mime: 'application/octet-stream', encoding: 'base64' },
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -47,13 +47,13 @@
|
|||
"devDependencies": {
|
||||
"@types/jest": "29.2.3",
|
||||
"@types/node": "18.11.9",
|
||||
"@typescript-eslint/eslint-plugin": "5.43.0",
|
||||
"@typescript-eslint/parser": "5.43.0",
|
||||
"@typescript-eslint/eslint-plugin": "5.44.0",
|
||||
"@typescript-eslint/parser": "5.44.0",
|
||||
"coveralls": "3.1.1",
|
||||
"eslint": "8.28.0",
|
||||
"eslint-config-prettier": "8.5.0",
|
||||
"jest": "29.3.1",
|
||||
"prettier": "2.7.1",
|
||||
"prettier": "2.8.0",
|
||||
"ts-jest": "29.0.3",
|
||||
"typescript": "4.9.3"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -29,8 +29,8 @@
|
|||
"typescript": "4.9.3"
|
||||
},
|
||||
"dependencies": {
|
||||
"@aws-sdk/client-s3": "3.213.0",
|
||||
"@aws-sdk/s3-request-presigner": "3.213.0",
|
||||
"@aws-sdk/client-s3": "3.216.0",
|
||||
"@aws-sdk/s3-request-presigner": "3.216.0",
|
||||
"@joplin/fork-htmlparser2": "^4.1.41",
|
||||
"@joplin/fork-sax": "^1.2.45",
|
||||
"@joplin/fork-uslug": "^1.0.6",
|
||||
|
|
|
|||
|
|
@ -1,74 +1 @@
|
|||
/*
|
||||
|
||||
Atom One Dark With support for ReasonML by Gidi Morris, based off work by Daniel Gamage
|
||||
|
||||
Original One Dark Syntax theme from https://github.com/atom/one-dark-syntax
|
||||
|
||||
*/
|
||||
.hljs {
|
||||
color: #abb2bf;
|
||||
background: #282c34;
|
||||
}
|
||||
.hljs-keyword, .hljs-operator {
|
||||
color: #F92672;
|
||||
}
|
||||
.hljs-pattern-match {
|
||||
color: #F92672;
|
||||
}
|
||||
.hljs-pattern-match .hljs-constructor {
|
||||
color: #61aeee;
|
||||
}
|
||||
.hljs-function {
|
||||
color: #61aeee;
|
||||
}
|
||||
.hljs-function .hljs-params {
|
||||
color: #A6E22E;
|
||||
}
|
||||
.hljs-function .hljs-params .hljs-typing {
|
||||
color: #FD971F;
|
||||
}
|
||||
.hljs-module-access .hljs-module {
|
||||
color: #7e57c2;
|
||||
}
|
||||
.hljs-constructor {
|
||||
color: #e2b93d;
|
||||
}
|
||||
.hljs-constructor .hljs-string {
|
||||
color: #9CCC65;
|
||||
}
|
||||
.hljs-comment, .hljs-quote {
|
||||
color: #b18eb1;
|
||||
font-style: italic;
|
||||
}
|
||||
.hljs-doctag, .hljs-formula {
|
||||
color: #c678dd;
|
||||
}
|
||||
.hljs-section, .hljs-name, .hljs-selector-tag, .hljs-deletion, .hljs-subst {
|
||||
color: #e06c75;
|
||||
}
|
||||
.hljs-literal {
|
||||
color: #56b6c2;
|
||||
}
|
||||
.hljs-string, .hljs-regexp, .hljs-addition, .hljs-attribute, .hljs-meta .hljs-string {
|
||||
color: #98c379;
|
||||
}
|
||||
.hljs-built_in,
|
||||
.hljs-title.class_,
|
||||
.hljs-class .hljs-title {
|
||||
color: #e6c07b;
|
||||
}
|
||||
.hljs-attr, .hljs-variable, .hljs-template-variable, .hljs-type, .hljs-selector-class, .hljs-selector-attr, .hljs-selector-pseudo, .hljs-number {
|
||||
color: #d19a66;
|
||||
}
|
||||
.hljs-symbol, .hljs-bullet, .hljs-link, .hljs-meta, .hljs-selector-id, .hljs-title {
|
||||
color: #61aeee;
|
||||
}
|
||||
.hljs-emphasis {
|
||||
font-style: italic;
|
||||
}
|
||||
.hljs-strong {
|
||||
font-weight: bold;
|
||||
}
|
||||
.hljs-link {
|
||||
text-decoration: underline;
|
||||
}
|
||||
pre code.hljs{display:block;overflow-x:auto;padding:1em}code.hljs{padding:3px 5px}.hljs{color:#abb2bf;background:#282c34}.hljs-keyword,.hljs-operator,.hljs-pattern-match{color:#f92672}.hljs-function,.hljs-pattern-match .hljs-constructor{color:#61aeee}.hljs-function .hljs-params{color:#a6e22e}.hljs-function .hljs-params .hljs-typing{color:#fd971f}.hljs-module-access .hljs-module{color:#7e57c2}.hljs-constructor{color:#e2b93d}.hljs-constructor .hljs-string{color:#9ccc65}.hljs-comment,.hljs-quote{color:#b18eb1;font-style:italic}.hljs-doctag,.hljs-formula{color:#c678dd}.hljs-deletion,.hljs-name,.hljs-section,.hljs-selector-tag,.hljs-subst{color:#e06c75}.hljs-literal{color:#56b6c2}.hljs-addition,.hljs-attribute,.hljs-meta .hljs-string,.hljs-regexp,.hljs-string{color:#98c379}.hljs-built_in,.hljs-class .hljs-title,.hljs-title.class_{color:#e6c07b}.hljs-attr,.hljs-number,.hljs-selector-attr,.hljs-selector-class,.hljs-selector-pseudo,.hljs-template-variable,.hljs-type,.hljs-variable{color:#d19a66}.hljs-bullet,.hljs-link,.hljs-meta,.hljs-selector-id,.hljs-symbol,.hljs-title{color:#61aeee}.hljs-emphasis{font-style:italic}.hljs-strong{font-weight:700}.hljs-link{text-decoration:underline}
|
||||
|
|
@ -1,94 +1 @@
|
|||
/*
|
||||
|
||||
Atom One Light by Daniel Gamage
|
||||
Original One Light Syntax theme from https://github.com/atom/one-light-syntax
|
||||
|
||||
base: #fafafa
|
||||
mono-1: #383a42
|
||||
mono-2: #686b77
|
||||
mono-3: #a0a1a7
|
||||
hue-1: #0184bb
|
||||
hue-2: #4078f2
|
||||
hue-3: #a626a4
|
||||
hue-4: #50a14f
|
||||
hue-5: #e45649
|
||||
hue-5-2: #c91243
|
||||
hue-6: #986801
|
||||
hue-6-2: #c18401
|
||||
|
||||
*/
|
||||
|
||||
.hljs {
|
||||
color: #383a42;
|
||||
background: #fafafa;
|
||||
}
|
||||
|
||||
.hljs-comment,
|
||||
.hljs-quote {
|
||||
color: #a0a1a7;
|
||||
font-style: italic;
|
||||
}
|
||||
|
||||
.hljs-doctag,
|
||||
.hljs-keyword,
|
||||
.hljs-formula {
|
||||
color: #a626a4;
|
||||
}
|
||||
|
||||
.hljs-section,
|
||||
.hljs-name,
|
||||
.hljs-selector-tag,
|
||||
.hljs-deletion,
|
||||
.hljs-subst {
|
||||
color: #e45649;
|
||||
}
|
||||
|
||||
.hljs-literal {
|
||||
color: #0184bb;
|
||||
}
|
||||
|
||||
.hljs-string,
|
||||
.hljs-regexp,
|
||||
.hljs-addition,
|
||||
.hljs-attribute,
|
||||
.hljs-meta .hljs-string {
|
||||
color: #50a14f;
|
||||
}
|
||||
|
||||
.hljs-attr,
|
||||
.hljs-variable,
|
||||
.hljs-template-variable,
|
||||
.hljs-type,
|
||||
.hljs-selector-class,
|
||||
.hljs-selector-attr,
|
||||
.hljs-selector-pseudo,
|
||||
.hljs-number {
|
||||
color: #986801;
|
||||
}
|
||||
|
||||
.hljs-symbol,
|
||||
.hljs-bullet,
|
||||
.hljs-link,
|
||||
.hljs-meta,
|
||||
.hljs-selector-id,
|
||||
.hljs-title {
|
||||
color: #4078f2;
|
||||
}
|
||||
|
||||
.hljs-built_in,
|
||||
.hljs-title.class_,
|
||||
.hljs-class .hljs-title {
|
||||
color: #c18401;
|
||||
}
|
||||
|
||||
.hljs-emphasis {
|
||||
font-style: italic;
|
||||
}
|
||||
|
||||
.hljs-strong {
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
.hljs-link {
|
||||
text-decoration: underline;
|
||||
}
|
||||
pre code.hljs{display:block;overflow-x:auto;padding:1em}code.hljs{padding:3px 5px}.hljs{color:#383a42;background:#fafafa}.hljs-comment,.hljs-quote{color:#a0a1a7;font-style:italic}.hljs-doctag,.hljs-formula,.hljs-keyword{color:#a626a4}.hljs-deletion,.hljs-name,.hljs-section,.hljs-selector-tag,.hljs-subst{color:#e45649}.hljs-literal{color:#0184bb}.hljs-addition,.hljs-attribute,.hljs-meta .hljs-string,.hljs-regexp,.hljs-string{color:#50a14f}.hljs-attr,.hljs-number,.hljs-selector-attr,.hljs-selector-class,.hljs-selector-pseudo,.hljs-template-variable,.hljs-type,.hljs-variable{color:#986801}.hljs-bullet,.hljs-link,.hljs-meta,.hljs-selector-id,.hljs-symbol,.hljs-title{color:#4078f2}.hljs-built_in,.hljs-class .hljs-title,.hljs-title.class_{color:#c18401}.hljs-emphasis{font-style:italic}.hljs-strong{font-weight:700}.hljs-link{text-decoration:underline}
|
||||
File diff suppressed because one or more lines are too long
|
|
@ -37,7 +37,12 @@ class HtmlUtils {
|
|||
|
||||
for (const n in attr) {
|
||||
if (!attr.hasOwnProperty(n)) continue;
|
||||
output.push(`${n}="${htmlentities(attr[n])}"`);
|
||||
|
||||
if (!attr[n]) {
|
||||
output.push(n);
|
||||
} else {
|
||||
output.push(`${n}="${htmlentities(attr[n])}"`);
|
||||
}
|
||||
}
|
||||
|
||||
return output.join(' ');
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
"@joplin/fork-uslug": "^1.0.6",
|
||||
"font-awesome-filetypes": "2.1.0",
|
||||
"fs-extra": "10.1.0",
|
||||
"highlight.js": "11.6.0",
|
||||
"highlight.js": "11.7.0",
|
||||
"html-entities": "1.4.0",
|
||||
"json-stringify-safe": "5.0.1",
|
||||
"katex": "0.13.24",
|
||||
|
|
@ -46,7 +46,7 @@
|
|||
"markdown-it-sup": "1.0.0",
|
||||
"markdown-it-toc-done-right": "4.2.0",
|
||||
"md5": "2.3.0",
|
||||
"mermaid": "9.1.7"
|
||||
"mermaid": "9.2.2"
|
||||
},
|
||||
"gitHead": "eb4b0e64eab40a51b0895d3a40a9d8c3cb7b1b14"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
"watch": "tsc --watch --preserveWatchOutput --project tsconfig.json"
|
||||
},
|
||||
"dependencies": {
|
||||
"@aws-sdk/client-s3": "3.213.0",
|
||||
"@aws-sdk/client-s3": "3.216.0",
|
||||
"@fortawesome/fontawesome-free": "5.15.4",
|
||||
"@joplin/lib": "~2.9",
|
||||
"@joplin/renderer": "~2.9",
|
||||
|
|
@ -66,9 +66,9 @@
|
|||
"@types/jsdom": "16.2.15",
|
||||
"@types/koa": "2.13.4",
|
||||
"@types/markdown-it": "12.2.3",
|
||||
"@types/mustache": "4.2.1",
|
||||
"@types/mustache": "4.2.2",
|
||||
"@types/nodemailer": "6.4.6",
|
||||
"@types/yargs": "17.0.13",
|
||||
"@types/yargs": "17.0.14",
|
||||
"@types/zxcvbn": "4.4.1",
|
||||
"gulp": "4.0.2",
|
||||
"jest": "29.3.1",
|
||||
|
|
|
|||
|
|
@ -11,46 +11,16 @@ const rootDir = `${__dirname}/../..`;
|
|||
|
||||
const markdownUtils = require('@joplin/lib/markdownUtils').default;
|
||||
const fs = require('fs-extra');
|
||||
const gettextParser = require('gettext-parser');
|
||||
|
||||
const { translationExecutablePath, removePoHeaderDate, mergePotToPo, parsePoFile, parseTranslations } = require('./utils/translation');
|
||||
const localesDir = `${__dirname}/locales`;
|
||||
const libDir = `${rootDir}/packages/lib`;
|
||||
|
||||
const { execCommand, isMac, insertContentIntoFile, filename, dirname, fileExtension } = require('./tool-utils.js');
|
||||
const { countryDisplayName, countryCodeOnly } = require('@joplin/lib/locale');
|
||||
|
||||
const { GettextExtractor, JsExtractors } = require('gettext-extractor');
|
||||
|
||||
|
||||
function parsePoFile(filePath) {
|
||||
const content = fs.readFileSync(filePath);
|
||||
return gettextParser.po.parse(content);
|
||||
}
|
||||
|
||||
function serializeTranslation(translation) {
|
||||
const output = {};
|
||||
|
||||
// Translations are grouped by "msgctxt"
|
||||
|
||||
for (const msgctxt of Object.keys(translation.translations)) {
|
||||
const translations = translation.translations[msgctxt];
|
||||
|
||||
for (const n in translations) {
|
||||
if (!translations.hasOwnProperty(n)) continue;
|
||||
if (n === '') continue;
|
||||
const t = translations[n];
|
||||
let translated = '';
|
||||
if (t.comments && t.comments.flag && t.comments.flag.indexOf('fuzzy') >= 0) {
|
||||
// Don't include fuzzy translations
|
||||
} else {
|
||||
translated = t['msgstr'][0];
|
||||
}
|
||||
|
||||
if (translated) output[n] = translated;
|
||||
}
|
||||
}
|
||||
|
||||
// Sort the translations to make the diff easier to read.
|
||||
const output = parseTranslations(translation);
|
||||
return JSON.stringify(output, Object.keys(output).sort((a, b) => a.toLowerCase() < b.toLowerCase() ? -1 : +1), ' ');
|
||||
}
|
||||
|
||||
|
|
@ -58,35 +28,12 @@ function saveToFile(filePath, data) {
|
|||
fs.writeFileSync(filePath, data);
|
||||
}
|
||||
|
||||
function buildLocale(inputFile, outputFile) {
|
||||
const r = parsePoFile(inputFile);
|
||||
async function buildLocale(inputFile, outputFile) {
|
||||
const r = await parsePoFile(inputFile);
|
||||
const translation = serializeTranslation(r);
|
||||
saveToFile(outputFile, translation);
|
||||
}
|
||||
|
||||
function executablePath(file) {
|
||||
const potentialPaths = [
|
||||
'/usr/local/opt/gettext/bin/',
|
||||
'/opt/local/bin/',
|
||||
'/usr/local/bin/',
|
||||
];
|
||||
|
||||
for (const path of potentialPaths) {
|
||||
const pathFile = path + file;
|
||||
if (fs.existsSync(pathFile)) {
|
||||
return pathFile;
|
||||
}
|
||||
}
|
||||
throw new Error(`${file} could not be found. Please install via brew or MacPorts.\n`);
|
||||
}
|
||||
|
||||
async function removePoHeaderDate(filePath) {
|
||||
let sedPrefix = 'sed -i';
|
||||
if (isMac()) sedPrefix += ' ""'; // Note: on macOS it has to be 'sed -i ""' (BSD quirk)
|
||||
await execCommand(`${sedPrefix} -e'/POT-Creation-Date:/d' "${filePath}"`);
|
||||
await execCommand(`${sedPrefix} -e'/PO-Revision-Date:/d' "${filePath}"`);
|
||||
}
|
||||
|
||||
async function createPotFile(potFilePath) {
|
||||
const excludedDirs = [
|
||||
'./.git/*',
|
||||
|
|
@ -225,16 +172,6 @@ async function createPotFile(potFilePath) {
|
|||
await removePoHeaderDate(potFilePath);
|
||||
}
|
||||
|
||||
async function mergePotToPo(potFilePath, poFilePath) {
|
||||
let msgmergePath = 'msgmerge';
|
||||
if (isMac()) msgmergePath = executablePath('msgmerge'); // Needs to have been installed with `brew install gettext`
|
||||
|
||||
const command = `${msgmergePath} -U "${poFilePath}" "${potFilePath}"`;
|
||||
const result = await execCommand(command);
|
||||
if (result && result.trim()) console.info(result.trim());
|
||||
await removePoHeaderDate(poFilePath);
|
||||
}
|
||||
|
||||
function buildIndex(locales, stats) {
|
||||
const output = [];
|
||||
output.push('var locales = {};');
|
||||
|
|
@ -296,7 +233,7 @@ function translatorNameToMarkdown(translatorName) {
|
|||
async function translationStatus(isDefault, poFile) {
|
||||
// "apt install translate-toolkit" to have pocount
|
||||
let pocountPath = 'pocount';
|
||||
if (isMac()) pocountPath = executablePath('pocount');
|
||||
if (isMac()) pocountPath = translationExecutablePath('pocount');
|
||||
|
||||
const command = `${pocountPath} "${poFile}"`;
|
||||
const result = await execCommand(command);
|
||||
|
|
@ -454,7 +391,7 @@ async function main() {
|
|||
const poFilePäth = `${localesDir}/${locale}.po`;
|
||||
const jsonFilePath = `${jsonLocalesDir}/${locale}.json`;
|
||||
if (locale !== defaultLocale) await mergePotToPo(potFilePath, poFilePäth);
|
||||
buildLocale(poFilePäth, jsonFilePath);
|
||||
await buildLocale(poFilePäth, jsonFilePath);
|
||||
|
||||
const stat = await translationStatus(defaultLocale === locale, poFilePäth);
|
||||
stat.locale = locale;
|
||||
|
|
|
|||
|
|
@ -51,6 +51,10 @@ const sources: Source[] = [
|
|||
id: 8,
|
||||
name: 'WebsiteTopImage.png',
|
||||
},
|
||||
{
|
||||
id: 9,
|
||||
name: 'WebsiteTopImageCn.png',
|
||||
},
|
||||
];
|
||||
|
||||
function sourceById(id: number) {
|
||||
|
|
@ -332,6 +336,41 @@ const operations: Operation[] = [
|
|||
width: 1205,
|
||||
height: 734,
|
||||
},
|
||||
|
||||
// ============================================================================
|
||||
// Website images CN
|
||||
// ============================================================================
|
||||
|
||||
{
|
||||
source: 9,
|
||||
dest: 'Assets/WebsiteAssets/images/home-top-img-cn-4x.webp',
|
||||
width: 4820,
|
||||
height: 2938,
|
||||
},
|
||||
{
|
||||
source: 9,
|
||||
dest: 'Assets/WebsiteAssets/images/home-top-img-cn-2x.png',
|
||||
width: 2388,
|
||||
height: 1456,
|
||||
},
|
||||
{
|
||||
source: 9,
|
||||
dest: 'Assets/WebsiteAssets/images/home-top-img-cn-2x.webp',
|
||||
width: 2388,
|
||||
height: 1456,
|
||||
},
|
||||
{
|
||||
source: 9,
|
||||
dest: 'Assets/WebsiteAssets/images/home-top-img-cn.png',
|
||||
width: 1205,
|
||||
height: 734,
|
||||
},
|
||||
{
|
||||
source: 9,
|
||||
dest: 'Assets/WebsiteAssets/images/home-top-img-cn.webp',
|
||||
width: 1205,
|
||||
height: 734,
|
||||
},
|
||||
];
|
||||
|
||||
async function main() {
|
||||
|
|
|
|||
|
|
@ -6,6 +6,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: Joplin-CLI 1.0.0\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: \n"
|
||||
"PO-Revision-Date: \n"
|
||||
"Last-Translator: KaneGreen <737445366KG@Gmail.com>\n"
|
||||
"Language-Team: zh_CN <737445366KG@Gmail.com>\n"
|
||||
"Language: zh_CN\n"
|
||||
|
|
@ -13,7 +15,7 @@ msgstr ""
|
|||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Plural-Forms: nplurals=1; plural=0;\n"
|
||||
"X-Generator: Poedit 3.1\n"
|
||||
"X-Generator: Poedit 3.2\n"
|
||||
|
||||
#: packages/app-mobile/components/screens/ConfigScreen.tsx:609
|
||||
msgid "- Camera: to allow taking a picture and attaching it to a note."
|
||||
|
|
@ -40,7 +42,7 @@ msgstr "(%s)"
|
|||
|
||||
#: packages/lib/services/plugins/api/JoplinViewsDialogs.ts:71
|
||||
msgid "(In plugin: %s)"
|
||||
msgstr ""
|
||||
msgstr "(在插件%s中)"
|
||||
|
||||
#: packages/lib/SyncTargetNone.ts:16
|
||||
msgid "(None)"
|
||||
|
|
@ -223,7 +225,7 @@ msgstr "接受"
|
|||
|
||||
#: packages/server/src/routes/admin/users.ts:138
|
||||
msgid "Account"
|
||||
msgstr ""
|
||||
msgstr "账号"
|
||||
|
||||
#: packages/app-desktop/gui/ResourceScreen.tsx:95
|
||||
msgid "Action"
|
||||
|
|
@ -313,12 +315,14 @@ msgid ""
|
|||
"Ambiguous notebook \"%s\". Please use notebook id instead - press \"ti\" to "
|
||||
"see the short notebook id or use $b for current selected notebook"
|
||||
msgstr ""
|
||||
"不明确的笔记本“%s”。请改用短笔记本id - 按\"ti\"查看短笔记本id,或使用 $b 选择"
|
||||
"当前笔记本"
|
||||
|
||||
#: packages/app-cli/app/command-mv.js:29
|
||||
msgid ""
|
||||
"Ambiguous notebook \"%s\". Please use short notebook id instead - press \"ti"
|
||||
"\" to see the short notebook id"
|
||||
msgstr ""
|
||||
msgstr "不明确的笔记本“%s”。请改用短笔记本id - 按\"ti\"查看短笔记本id"
|
||||
|
||||
#: packages/app-desktop/checkForUpdates.ts:197
|
||||
msgid "An update is available, do you want to download it now?"
|
||||
|
|
@ -350,9 +354,8 @@ msgid "Aritim Dark"
|
|||
msgstr "暗黑 (Aritim)"
|
||||
|
||||
#: packages/app-mobile/components/NoteEditor/MarkdownToolbar/MarkdownToolbar.tsx:206
|
||||
#, fuzzy
|
||||
msgid "Attach"
|
||||
msgstr "附加..."
|
||||
msgstr "附加"
|
||||
|
||||
#: packages/app-desktop/gui/NoteEditor/editorCommandDeclarations.ts:53
|
||||
#: packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.tsx:591
|
||||
|
|
@ -590,7 +593,7 @@ msgstr ""
|
|||
|
||||
#: packages/app-mobile/components/NoteEditor/SearchPanel.tsx:328
|
||||
msgid "Case sensitive"
|
||||
msgstr ""
|
||||
msgstr "大小写敏感"
|
||||
|
||||
#: packages/app-desktop/gui/MainScreen/commands/toggleLayoutMoveMode.ts:7
|
||||
msgid "Change application layout"
|
||||
|
|
@ -698,7 +701,7 @@ msgstr "与他人共同协作笔记本"
|
|||
|
||||
#: packages/app-mobile/components/side-menu-content.tsx:331
|
||||
msgid "Collapse"
|
||||
msgstr ""
|
||||
msgstr "折叠"
|
||||
|
||||
#: packages/lib/services/ReportService.ts:305
|
||||
msgid "Coming alarms"
|
||||
|
|
@ -1021,7 +1024,7 @@ msgstr "天"
|
|||
|
||||
#: packages/app-mobile/components/NoteEditor/MarkdownToolbar/MarkdownToolbar.tsx:109
|
||||
msgid "Decrease indent level"
|
||||
msgstr ""
|
||||
msgstr "减少缩进级别"
|
||||
|
||||
#: packages/app-cli/app/command-e2ee.ts:64
|
||||
msgid "Decrypted items: %d"
|
||||
|
|
@ -1268,7 +1271,7 @@ msgstr ""
|
|||
|
||||
#: packages/app-mobile/components/NoteEditor/EditLinkDialog.tsx:149
|
||||
msgid "Done"
|
||||
msgstr ""
|
||||
msgstr "完成"
|
||||
|
||||
#: packages/app-desktop/checkForUpdates.ts:199
|
||||
msgid "Download"
|
||||
|
|
@ -1625,7 +1628,7 @@ msgstr "退出应用。"
|
|||
|
||||
#: packages/app-mobile/components/side-menu-content.tsx:331
|
||||
msgid "Expand"
|
||||
msgstr ""
|
||||
msgstr "展开"
|
||||
|
||||
#: packages/app-desktop/gui/KeymapConfig/KeymapConfigScreen.tsx:171
|
||||
#: packages/app-desktop/gui/Sidebar/Sidebar.tsx:375
|
||||
|
|
@ -1717,7 +1720,7 @@ msgstr "筛选标签"
|
|||
|
||||
#: packages/app-mobile/components/NoteEditor/MarkdownToolbar/MarkdownToolbar.tsx:218
|
||||
msgid "Find and replace"
|
||||
msgstr ""
|
||||
msgstr "查找和替换"
|
||||
|
||||
#: packages/app-mobile/components/NoteEditor/SearchPanel.tsx:250
|
||||
#, fuzzy
|
||||
|
|
@ -1762,7 +1765,7 @@ msgstr "仅用于调试目的：将您的配置文件导出到外部 SD 卡。"
|
|||
|
||||
#: packages/lib/models/Setting.ts:1449
|
||||
msgid "For example \"%s\""
|
||||
msgstr ""
|
||||
msgstr "例如\"%s\""
|
||||
|
||||
#: packages/app-cli/app/command-help.js:36
|
||||
msgid "For information on how to customise the shortcuts please visit %s"
|
||||
|
|
@ -1877,12 +1880,11 @@ msgstr "隐藏 %s"
|
|||
|
||||
#: packages/app-mobile/components/NoteEditor/SearchPanel.tsx:218
|
||||
msgid "Hide advanced"
|
||||
msgstr ""
|
||||
msgstr "隐藏高级的"
|
||||
|
||||
#: packages/server/src/routes/admin/users.ts:200
|
||||
#, fuzzy
|
||||
msgid "Hide disabled"
|
||||
msgstr "隐藏禁用的密钥"
|
||||
msgstr "隐藏禁用的"
|
||||
|
||||
#: packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.tsx:172
|
||||
msgid "Hide disabled keys"
|
||||
|
|
@ -1894,11 +1896,11 @@ msgstr "隐藏 Joplin"
|
|||
|
||||
#: packages/app-mobile/components/NoteEditor/MarkdownToolbar/MarkdownToolbar.tsx:253
|
||||
msgid "Hide keyboard"
|
||||
msgstr ""
|
||||
msgstr "隐藏键盘"
|
||||
|
||||
#: packages/app-mobile/components/NoteEditor/MarkdownToolbar/ToggleOverflowButton.tsx:22
|
||||
msgid "Hide more actions"
|
||||
msgstr ""
|
||||
msgstr "隐藏更多动作"
|
||||
|
||||
#: packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/setupToolbarButtons.ts:14
|
||||
msgid "Highlight"
|
||||
|
|
@ -2050,7 +2052,7 @@ msgstr "位于：%s"
|
|||
|
||||
#: packages/app-mobile/components/NoteEditor/MarkdownToolbar/MarkdownToolbar.tsx:119
|
||||
msgid "Increase indent level"
|
||||
msgstr ""
|
||||
msgstr "增加缩进级别"
|
||||
|
||||
#: packages/app-desktop/gui/NoteEditor/editorCommandDeclarations.ts:104
|
||||
msgid "Indent less"
|
||||
|
|
@ -2223,7 +2225,7 @@ msgstr ""
|
|||
|
||||
#: packages/app-mobile/components/NoteEditor/MarkdownToolbar/MarkdownToolbar.tsx:162
|
||||
msgid "KaTeX"
|
||||
msgstr ""
|
||||
msgstr "KaTeX"
|
||||
|
||||
#: packages/lib/models/Setting.ts:1494
|
||||
msgid "Keep note history for"
|
||||
|
|
@ -2551,7 +2553,7 @@ msgstr "新版本：%s"
|
|||
|
||||
#: packages/app-mobile/components/NoteEditor/SearchPanel.tsx:268
|
||||
msgid "Next match"
|
||||
msgstr ""
|
||||
msgstr "下次匹配"
|
||||
|
||||
#: packages/lib/SyncTargetNextcloud.js:25
|
||||
msgid "Nextcloud"
|
||||
|
|
@ -3039,7 +3041,7 @@ msgstr "点按设置解密密码。"
|
|||
|
||||
#: packages/app-mobile/components/NoteEditor/SearchPanel.tsx:278
|
||||
msgid "Previous match"
|
||||
msgstr ""
|
||||
msgstr "上次匹配"
|
||||
|
||||
#: packages/app-desktop/gui/NotePropertiesDialog.min.js:307
|
||||
msgid "Previous versions of this note"
|
||||
|
|
@ -3088,11 +3090,11 @@ msgstr "已启用"
|
|||
|
||||
#: packages/lib/models/Setting.ts:1459
|
||||
msgid "Proxy timeout (seconds)"
|
||||
msgstr ""
|
||||
msgstr "代理超时(秒)"
|
||||
|
||||
#: packages/lib/models/Setting.ts:1448
|
||||
msgid "Proxy URL"
|
||||
msgstr ""
|
||||
msgstr "代理URL"
|
||||
|
||||
#: packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.tsx:252
|
||||
msgid "Public-private key pair:"
|
||||
|
|
@ -3211,7 +3213,7 @@ msgstr "更新令牌"
|
|||
|
||||
#: packages/app-mobile/components/NoteEditor/SearchPanel.tsx:288
|
||||
msgid "Replace"
|
||||
msgstr ""
|
||||
msgstr "替换"
|
||||
|
||||
#: packages/app-mobile/components/NoteEditor/SearchPanel.tsx:298
|
||||
#, fuzzy
|
||||
|
|
@ -3224,7 +3226,7 @@ msgstr ""
|
|||
|
||||
#: packages/app-mobile/components/NoteEditor/SearchPanel.tsx:257
|
||||
msgid "Replace: "
|
||||
msgstr ""
|
||||
msgstr "替换: "
|
||||
|
||||
#: packages/app-desktop/gui/MasterPasswordDialog/Dialog.tsx:219
|
||||
#: packages/app-desktop/gui/MasterPasswordDialog/Dialog.tsx:220
|
||||
|
|
@ -3515,7 +3517,7 @@ msgstr "显示托盘图标"
|
|||
|
||||
#: packages/app-mobile/components/ScreenHeader.tsx:287
|
||||
msgid "Show/hide the sidebar"
|
||||
msgstr ""
|
||||
msgstr "显示/隐藏侧边栏"
|
||||
|
||||
#: packages/app-desktop/gui/Sidebar/commands/focusElementSideBar.ts:8
|
||||
#: packages/app-mobile/components/ScreenHeader.tsx:286
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
"@joplin/lib": "^2.9.1",
|
||||
"@joplin/renderer": "^2.9.1",
|
||||
"@types/node-fetch": "2.6.2",
|
||||
"@types/yargs": "17.0.13",
|
||||
"@types/yargs": "17.0.14",
|
||||
"dayjs": "1.11.6",
|
||||
"execa": "4.1.0",
|
||||
"fs-extra": "10.1.0",
|
||||
|
|
@ -42,13 +42,15 @@
|
|||
"yargs": "17.6.2"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@joplin/fork-htmlparser2": "^4.1.41",
|
||||
"@rmp135/sql-ts": "1.15.1",
|
||||
"@types/fs-extra": "9.0.13",
|
||||
"@types/jest": "29.2.3",
|
||||
"@types/mustache": "4.2.1",
|
||||
"@types/mustache": "4.2.2",
|
||||
"@types/node": "18.11.9",
|
||||
"gettext-extractor": "3.6.0",
|
||||
"gulp": "4.0.2",
|
||||
"html-entities": "1.4.0",
|
||||
"jest": "29.3.1",
|
||||
"rss": "1.2.2",
|
||||
"sass": "1.56.1",
|
||||
|
|
|
|||
|
|
@ -0,0 +1,72 @@
|
|||
import { execCommand, isMac } from '../tool-utils';
|
||||
import { existsSync, readFile } from 'fs-extra';
|
||||
const gettextParser = require('gettext-parser');
|
||||
|
||||
export const removePoHeaderDate = async (filePath: string) => {
|
||||
let sedPrefix = 'sed -i';
|
||||
if (isMac()) sedPrefix += ' ""'; // Note: on macOS it has to be 'sed -i ""' (BSD quirk)
|
||||
await execCommand(`${sedPrefix} -e'/POT-Creation-Date:/d' "${filePath}"`);
|
||||
await execCommand(`${sedPrefix} -e'/PO-Revision-Date:/d' "${filePath}"`);
|
||||
};
|
||||
|
||||
export const translationExecutablePath = (file: string) => {
|
||||
const potentialPaths = [
|
||||
'/usr/local/opt/gettext/bin/',
|
||||
'/opt/local/bin/',
|
||||
'/usr/local/bin/',
|
||||
];
|
||||
|
||||
for (const path of potentialPaths) {
|
||||
const pathFile = path + file;
|
||||
if (existsSync(pathFile)) {
|
||||
return pathFile;
|
||||
}
|
||||
}
|
||||
|
||||
throw new Error(`${file} could not be found. Please install via brew or MacPorts.\n`);
|
||||
};
|
||||
|
||||
export const mergePotToPo = async (potFilePath: string, poFilePath: string) => {
|
||||
let msgmergePath = 'msgmerge';
|
||||
if (isMac()) msgmergePath = translationExecutablePath('msgmerge'); // Needs to have been installed with `brew install gettext`
|
||||
|
||||
const command = `${msgmergePath} -U "${poFilePath}" "${potFilePath}"`;
|
||||
const result = await execCommand(command);
|
||||
if (result && result.trim()) console.info(result.trim());
|
||||
await removePoHeaderDate(poFilePath);
|
||||
};
|
||||
|
||||
export const parsePoFile = async (filePath: string) => {
|
||||
const content = await readFile(filePath);
|
||||
return gettextParser.po.parse(content);
|
||||
};
|
||||
|
||||
// Convert the gettext translations, as returned by `gettextParser.po.parse()`
|
||||
// to a <string, string> map, with the English text on the left and the
|
||||
// translation on the right. If a particular translation is missing, no entry
|
||||
// will be returned. The caller should display the English text in this case.
|
||||
export const parseTranslations = (gettextTranslations: any) => {
|
||||
const output: Record<string, string> = {};
|
||||
|
||||
// Translations are grouped by "msgctxt"
|
||||
|
||||
for (const msgctxt of Object.keys(gettextTranslations.translations)) {
|
||||
const translations = gettextTranslations.translations[msgctxt];
|
||||
|
||||
for (const n in translations) {
|
||||
if (!translations.hasOwnProperty(n)) continue;
|
||||
if (n === '') continue;
|
||||
const t = translations[n];
|
||||
let translated = '';
|
||||
if (t.comments && t.comments.flag && t.comments.flag.indexOf('fuzzy') >= 0) {
|
||||
// Don't include fuzzy translations
|
||||
} else {
|
||||
translated = t['msgstr'][0];
|
||||
}
|
||||
|
||||
if (translated) output[n] = translated;
|
||||
}
|
||||
}
|
||||
|
||||
return output;
|
||||
};
|
||||
|
|
@ -10,6 +10,8 @@ import { readmeFileTitle, replaceGitHubByWebsiteLinks } from './utils/parser';
|
|||
import { extractOpenGraphTags } from './utils/openGraph';
|
||||
import { readCredentialFileJson } from '@joplin/lib/utils/credentialFiles';
|
||||
import { getNewsDateString } from './utils/news';
|
||||
import { parsePoFile, parseTranslations } from '../utils/translation';
|
||||
import processTranslations from './utils/processTranslations';
|
||||
|
||||
interface BuildConfig {
|
||||
env: Env;
|
||||
|
|
@ -389,6 +391,9 @@ async function main() {
|
|||
url: 'https://joplinapp.org/news/',
|
||||
},
|
||||
});
|
||||
|
||||
const translations = parseTranslations(await parsePoFile(`${websiteAssetDir}/locales/zh_CN.po`));
|
||||
await processTranslations(`${docDir}/index.html`, `${docDir}/cn/index.html`, 'zh-cn', translations);
|
||||
}
|
||||
|
||||
main().catch((error) => {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,29 @@
|
|||
import { rootDir } from '../tool-utils';
|
||||
import { mergePotToPo } from '../utils/translation';
|
||||
const { GettextExtractor, HtmlExtractors } = require('gettext-extractor');
|
||||
|
||||
const websiteAssetsDir = `${rootDir}/Assets/WebsiteAssets`;
|
||||
const localesDir = `${websiteAssetsDir}/locales`;
|
||||
|
||||
const createPotFile = async (potFilePath: string) => {
|
||||
const extractor = new GettextExtractor();
|
||||
|
||||
extractor
|
||||
.createHtmlParser([
|
||||
HtmlExtractors.elementContent('[translate]'),
|
||||
])
|
||||
.parseFile(`${websiteAssetsDir}/templates/front.mustache`);
|
||||
|
||||
extractor.savePotFile(potFilePath);
|
||||
};
|
||||
|
||||
const main = async () => {
|
||||
const potFilePath = `${websiteAssetsDir}/website.pot`;
|
||||
await createPotFile(potFilePath);
|
||||
await mergePotToPo(potFilePath, `${localesDir}/zh_CN.po`);
|
||||
};
|
||||
|
||||
main().catch((error) => {
|
||||
console.error(error);
|
||||
process.exit(1);
|
||||
});
|
||||
|
|
@ -0,0 +1,41 @@
|
|||
import applyTranslations from './applyTranslations';
|
||||
|
||||
describe('applyTranslations', () => {
|
||||
|
||||
it('should apply translations', async () => {
|
||||
const tests = [
|
||||
{
|
||||
html: '<div><span translate>Translate me</span></div>',
|
||||
translations: {
|
||||
'Translate me': 'Traduis moi',
|
||||
},
|
||||
htmlTranslated: '<div>\n<span translate>\nTraduis moi\n</span>\n</div>',
|
||||
},
|
||||
{
|
||||
html: '<div><span translate>Missing translation</span></div>',
|
||||
translations: {},
|
||||
htmlTranslated: '<div>\n<span translate>\nMissing translation\n</span>\n</div>',
|
||||
},
|
||||
{
|
||||
html: '<h1 translate class="text-center">\nFree your <span class="frame-bg frame-bg-blue">notes</span>\n</h1>',
|
||||
translations: {
|
||||
'Free your <span class="frame-bg frame-bg-blue">notes</span>': 'Libérez vos <span class="frame-bg frame-bg-blue">notes</span>',
|
||||
},
|
||||
htmlTranslated: '<h1 translate class="text-center">\nLibérez vos <span class="frame-bg frame-bg-blue">notes</span>\n</h1>',
|
||||
},
|
||||
{
|
||||
html: '<div translate>Save <span class="frame-bg frame-bg-blue">web pages</span> <br />as notes</div>',
|
||||
translations: {
|
||||
'Save <span class="frame-bg frame-bg-blue">web pages</span> <br>as notes': 'Sauvegardez vos <span class="frame-bg frame-bg-blue">pages web</span> <br>en notes',
|
||||
},
|
||||
htmlTranslated: '<div translate>\nSauvegardez vos <span class="frame-bg frame-bg-blue">pages web</span> <br>en notes\n</div>',
|
||||
},
|
||||
];
|
||||
|
||||
for (const test of tests) {
|
||||
const actual = applyTranslations(test.html, test.translations);
|
||||
expect(actual).toEqual(test.htmlTranslated);
|
||||
}
|
||||
});
|
||||
|
||||
});
|
||||
|
|
@ -0,0 +1,131 @@
|
|||
import { unique } from '@joplin/lib/ArrayUtils';
|
||||
import htmlUtils from '@joplin/renderer/htmlUtils';
|
||||
const Entities = require('html-entities').AllHtmlEntities;
|
||||
const htmlentities = new Entities().encode;
|
||||
const htmlparser2 = require('@joplin/fork-htmlparser2');
|
||||
|
||||
const trimHtml = (content: string) => {
|
||||
return content
|
||||
.replace(/\n/g, '')
|
||||
.replace(/^(&tab;)+/i, '')
|
||||
.replace(/^( )+/i, '')
|
||||
.replace(/(&tab;)+$/i, '')
|
||||
.replace(/( )+$/i, '');
|
||||
};
|
||||
|
||||
const findTranslation = (englishString: string, translations: Record<string, string>): string => {
|
||||
const stringsToTry = unique([
|
||||
englishString,
|
||||
englishString.replace(/<br\/>/gi, '<br>'),
|
||||
englishString.replace(/<br \/>/gi, '<br>'),
|
||||
englishString
|
||||
.replace(/'/gi, '\'')
|
||||
.replace(/"/gi, '"'),
|
||||
]) as string[];
|
||||
|
||||
for (const stringToTry of stringsToTry) {
|
||||
if (translations[stringToTry]) return translations[stringToTry];
|
||||
}
|
||||
|
||||
return englishString;
|
||||
};
|
||||
|
||||
|
||||
export default (html: string, translations: Record<string, string>) => {
|
||||
const output: string[] = [];
|
||||
|
||||
interface State {
|
||||
// When inside a block that needs to be translated, this array
|
||||
// accumulates the opening tags. For example, this text:
|
||||
//
|
||||
// <div translate>Hello <b>world</b></div>
|
||||
//
|
||||
// will have the tags ['div', 'b']
|
||||
//
|
||||
// This is used to track when we've processed all the content, including
|
||||
// HTML content, within a translatable block. Once that stack is empty,
|
||||
// we reached the end, and can translate the string that we got.
|
||||
translateStack: string[];
|
||||
|
||||
// Keep a reference to the opening tag. For example in:
|
||||
//
|
||||
// <div translate>Hello <b>world</b></div>
|
||||
//
|
||||
// The opening tag is "div".
|
||||
currentTranslationTag: string[];
|
||||
|
||||
// Once we finished processing the translable block, this will contain
|
||||
// the string to be translated. It may contain HTML.
|
||||
currentTranslationContent: string[];
|
||||
|
||||
// Tells if we're at the beginning of a translable block.
|
||||
translateIsOpening: boolean;
|
||||
}
|
||||
|
||||
const state: State = {
|
||||
translateStack: [],
|
||||
currentTranslationTag: [],
|
||||
currentTranslationContent: [],
|
||||
translateIsOpening: false,
|
||||
};
|
||||
|
||||
const pushContent = (state: State, content: string) => {
|
||||
if (state.translateStack.length) {
|
||||
if (state.translateIsOpening) {
|
||||
state.currentTranslationTag.push(content);
|
||||
} else {
|
||||
state.currentTranslationContent.push(content);
|
||||
}
|
||||
} else {
|
||||
output.push(content);
|
||||
}
|
||||
};
|
||||
|
||||
const parser = new htmlparser2.Parser({
|
||||
|
||||
onopentag: (name: string, attrs: any) => {
|
||||
if ('translate' in attrs) {
|
||||
if (state.translateStack.length) throw new Error(`Cannot have a translate block within another translate block. At tag "${name}" attrs: ${JSON.stringify(attrs)}`);
|
||||
state.translateStack.push(name);
|
||||
state.currentTranslationContent = [];
|
||||
state.currentTranslationTag = [];
|
||||
state.translateIsOpening = true;
|
||||
} else if (state.translateStack.length) {
|
||||
state.translateStack.push(name);
|
||||
}
|
||||
|
||||
let attrHtml = htmlUtils.attributesHtml(attrs);
|
||||
if (attrHtml) attrHtml = ` ${attrHtml}`;
|
||||
const closingSign = htmlUtils.isSelfClosingTag(name) ? '/>' : '>';
|
||||
|
||||
pushContent(state, `<${name}${attrHtml}${closingSign}`);
|
||||
state.translateIsOpening = false;
|
||||
},
|
||||
|
||||
ontext: (decodedText: string) => {
|
||||
pushContent(state, htmlentities(decodedText));
|
||||
},
|
||||
|
||||
onclosetag: (name: string) => {
|
||||
if (state.translateStack.length) {
|
||||
state.translateStack.pop();
|
||||
|
||||
if (!state.translateStack.length) {
|
||||
const stringToTranslate = trimHtml(state.currentTranslationContent.join(''));
|
||||
const translation = findTranslation(stringToTranslate, translations);
|
||||
output.push(state.currentTranslationTag[0]);
|
||||
output.push(translation);
|
||||
}
|
||||
}
|
||||
|
||||
if (htmlUtils.isSelfClosingTag(name)) return;
|
||||
pushContent(state, `</${name}>`);
|
||||
},
|
||||
|
||||
}, { decodeEntities: true });
|
||||
|
||||
parser.write(html);
|
||||
parser.end();
|
||||
|
||||
return output.join('\n');
|
||||
};
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
import { mkdirp, readFile, writeFile } from 'fs-extra';
|
||||
import { dirname } from 'path';
|
||||
import applyTranslations from './applyTranslations';
|
||||
|
||||
export default async (englishFilePath: string, translatedFilePath: string, languageCode: string, translations: Record<string, string>) => {
|
||||
let content = await readFile(englishFilePath, 'utf8');
|
||||
content = content.replace('<html lang="en-gb">', `<html lang="${languageCode}">`);
|
||||
const translatedContent = await applyTranslations(content, translations);
|
||||
const translatedDirname = dirname(translatedFilePath);
|
||||
await mkdirp(translatedDirname);
|
||||
await writeFile(translatedFilePath, translatedContent, 'utf8');
|
||||
};
|
||||
|
|
@ -1,5 +1,6 @@
|
|||
---
|
||||
tweet: Modernising and securing Joplin, one package at a time
|
||||
forum_url: https://discourse.joplinapp.org/t/28366
|
||||
---
|
||||
|
||||
# Modernising and securing Joplin, one package at a time
|
||||
|
|
|
|||
|
|
@ -108,8 +108,11 @@
|
|||
// and TypeScript are safe to upgrade. They are frequently
|
||||
// updated so having them here reduces noise.
|
||||
"eslint",
|
||||
"@typescript-eslint/eslint-plugin",
|
||||
"@typescript-eslint/parser",
|
||||
"yarn",
|
||||
"typescript",
|
||||
"prettier",
|
||||
],
|
||||
"matchUpdateTypes": ["minor", "patch"],
|
||||
"automerge": true
|
||||
|
|
|
|||
Loading…
Reference in New Issue