summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortoasted-nutbread <toasted-nutbread@users.noreply.github.com>2021-02-12 20:37:43 -0500
committerGitHub <noreply@github.com>2021-02-12 20:37:43 -0500
commit8454f52378b9410393262122c6920606e187e18f (patch)
treeaee59787dc825fcb47ae06a404be33cf6521f774
parentf70464e5f36e342c345d38823d5a7e4712df8df0 (diff)
Move more data files (#1373)
* Move deinflect.json * Move button.mp3 * Move fonts
-rw-r--r--ext/bg/js/backend.js2
-rw-r--r--ext/data/audio/button.mp3 (renamed from ext/mixed/mp3/button.mp3)bin17735 -> 17735 bytes
-rw-r--r--ext/data/deinflect.json (renamed from ext/bg/lang/deinflect.json)0
-rw-r--r--ext/data/fonts/kanji-stroke-orders.ttf (renamed from ext/mixed/ttf/kanji-stroke-orders.ttf)bin17999116 -> 17999116 bytes
-rw-r--r--ext/mixed/css/display.css2
-rw-r--r--ext/mixed/js/audio-system.js2
-rw-r--r--test/test-deinflector.js2
-rw-r--r--test/test-translator.js2
8 files changed, 5 insertions, 5 deletions
diff --git a/ext/bg/js/backend.js b/ext/bg/js/backend.js
index 3970fe2d..a1f5e6d1 100644
--- a/ext/bg/js/backend.js
+++ b/ext/bg/js/backend.js
@@ -207,7 +207,7 @@ class Backend {
yomichan.logError(e);
}
- const deinflectionReasions = await this._fetchAsset('/bg/lang/deinflect.json', true);
+ const deinflectionReasions = await this._fetchAsset('/data/deinflect.json', true);
this._translator.prepare(deinflectionReasions);
await this._optionsUtil.prepare();
diff --git a/ext/mixed/mp3/button.mp3 b/ext/data/audio/button.mp3
index 7a9728d1..7a9728d1 100644
--- a/ext/mixed/mp3/button.mp3
+++ b/ext/data/audio/button.mp3
Binary files differ
diff --git a/ext/bg/lang/deinflect.json b/ext/data/deinflect.json
index a1ec6eb0..a1ec6eb0 100644
--- a/ext/bg/lang/deinflect.json
+++ b/ext/data/deinflect.json
diff --git a/ext/mixed/ttf/kanji-stroke-orders.ttf b/ext/data/fonts/kanji-stroke-orders.ttf
index 154fa473..154fa473 100644
--- a/ext/mixed/ttf/kanji-stroke-orders.ttf
+++ b/ext/data/fonts/kanji-stroke-orders.ttf
Binary files differ
diff --git a/ext/mixed/css/display.css b/ext/mixed/css/display.css
index 476b2c35..bd381c6d 100644
--- a/ext/mixed/css/display.css
+++ b/ext/mixed/css/display.css
@@ -208,7 +208,7 @@
/* Fonts */
@font-face {
font-family: kanji-stroke-orders;
- src: url('/mixed/ttf/kanji-stroke-orders.ttf');
+ src: url('/data/fonts/kanji-stroke-orders.ttf');
}
diff --git a/ext/mixed/js/audio-system.js b/ext/mixed/js/audio-system.js
index 0933d90e..cf63511f 100644
--- a/ext/mixed/js/audio-system.js
+++ b/ext/mixed/js/audio-system.js
@@ -35,7 +35,7 @@ class AudioSystem {
getFallbackAudio() {
if (this._fallbackAudio === null) {
- this._fallbackAudio = new Audio('/mixed/mp3/button.mp3');
+ this._fallbackAudio = new Audio('/data/audio/button.mp3');
}
return this._fallbackAudio;
}
diff --git a/test/test-deinflector.js b/test/test-deinflector.js
index 6ab00a94..dbc1f7e2 100644
--- a/test/test-deinflector.js
+++ b/test/test-deinflector.js
@@ -884,7 +884,7 @@ function testDeinflections() {
vm.execute(['bg/js/deinflector.js']);
const [Deinflector] = vm.get(['Deinflector']);
- const deinflectionReasions = JSON.parse(fs.readFileSync(path.join(__dirname, '..', 'ext', 'bg/lang/deinflect.json')));
+ const deinflectionReasions = JSON.parse(fs.readFileSync(path.join(__dirname, '..', 'ext', 'data/deinflect.json')));
const deinflector = new Deinflector(deinflectionReasions);
for (const {valid, tests} of data) {
diff --git a/test/test-translator.js b/test/test-translator.js
index cee7fe16..778a7ce1 100644
--- a/test/test-translator.js
+++ b/test/test-translator.js
@@ -81,7 +81,7 @@ async function createVM() {
// Setup translator
const japaneseUtil = new JapaneseUtil(null);
const translator = new Translator({japaneseUtil, database: dictionaryDatabase});
- const deinflectionReasions = JSON.parse(fs.readFileSync(path.join(__dirname, '..', 'ext', 'bg/lang/deinflect.json')));
+ const deinflectionReasions = JSON.parse(fs.readFileSync(path.join(__dirname, '..', 'ext', 'data/deinflect.json')));
translator.prepare(deinflectionReasions);
// Done