Skip to content

Commit

Permalink
Merge branch 'master' into updatable
Browse files Browse the repository at this point in the history
  • Loading branch information
StefanVukovic99 committed Jul 6, 2024
2 parents e593394 + 22d5928 commit 1846ba4
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions ext/js/language/translator.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import {applyTextReplacement} from '../general/regex-util.js';
import {isCodePointJapanese} from './ja/japanese.js';
import {LanguageTransformer} from './language-transformer.js';
import {getAllLanguageTextProcessors, getAllLanguageReadingNormalizers} from './languages.js';
import {getAllLanguageReadingNormalizers, getAllLanguageTextProcessors} from './languages.js';
import {MultiLanguageTransformer} from './multi-language-transformer.js';

/**
Expand Down Expand Up @@ -219,7 +219,7 @@ export class Translator {
*/
async _findTermsInternal(text, options, tagAggregator) {
const {removeNonJapaneseCharacters, enabledDictionaryMap} = options;
if (removeNonJapaneseCharacters) {
if (removeNonJapaneseCharacters && options.language === 'ja') {
text = this._getJapaneseOnlyText(text);
}
if (text.length === 0) {
Expand Down
2 changes: 1 addition & 1 deletion ext/settings.html
Original file line number Diff line number Diff line change
Expand Up @@ -2432,7 +2432,7 @@ <h1>Yomitan Settings</h1>
</div>
<div class="modal-footer">
<button type="button" class="low-emphasis danger dictionary-database-mutating-input" id="dictionary-delete-all-button">Delete All</button>
<button type="button" class="low-emphasis dictionary-database-mutating-input" id="dictionary-check-integrity">Check Integrity</button>
<button type="button" class="low-emphasis dictionary-database-mutating-input advanced-only" id="dictionary-check-integrity">Check Integrity</button>
<button type="button" class="low-emphasis dictionary-database-mutating-input" id="dictionary-check-updates">Check for Updates</button>
<button type="button" class="low-emphasis dictionary-database-mutating-input" id="dictionary-import-button">Import</button>
<button type="button" data-modal-action="hide">Close</button>
Expand Down

0 comments on commit 1846ba4

Please sign in to comment.