From 2fee131aa425233a0899206bb3c2ab0efd6cdc6e Mon Sep 17 00:00:00 2001 From: Myeongjin Date: Sun, 18 Oct 2015 17:26:42 +0900 Subject: [PATCH] add localisable strings for Internal JavaScript Error --- boot/boot.js | 4 ++-- core/language/en-GB/Misc.multids | 2 ++ languages/ko-KR/Misc.multids | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/boot/boot.js b/boot/boot.js index acdfa0327..dab39238f 100644 --- a/boot/boot.js +++ b/boot/boot.js @@ -126,8 +126,8 @@ Display an error and exit */ $tw.utils.error = function(err) { // Prepare the error message - var errHeading = "Internal JavaScript Error", - promptMsg = "Well, this is embarrassing. It is recommended that you restart TiddlyWiki by refreshing your browser"; + var errHeading = ( $tw.language == undefined ? "Internal JavaScript Error" : $tw.language.getString("InternalJavaScriptError/Title") ), + promptMsg = ( $tw.language == undefined ? "Well, this is embarrassing. It is recommended that you restart TiddlyWiki by refreshing your browser" : $tw.language.getString("InternalJavaScriptError/Hint") ); // Log the error to the console console.error($tw.node ? "\x1b[1;31m" + err + "\x1b[0m" : err); if($tw.browser && !$tw.node) { diff --git a/core/language/en-GB/Misc.multids b/core/language/en-GB/Misc.multids index 757292313..d703bebd0 100644 --- a/core/language/en-GB/Misc.multids +++ b/core/language/en-GB/Misc.multids @@ -19,6 +19,8 @@ Encryption/Password: Password Encryption/RepeatPassword: Repeat password Encryption/PasswordNoMatch: Passwords do not match Encryption/SetPassword: Set password +InternalJavaScriptError/Title: Internal JavaScript Error +InternalJavaScriptError/Hint: Well, this is embarrassing. It is recommended that you restart TiddlyWiki by refreshing your browser InvalidFieldName: Illegal characters in field name "<$text text=<>/>". Fields can only contain lowercase letters, digits and the characters underscore (`_`), hyphen (`-`) and period (`.`) LazyLoadingWarning:

Loading external text from ''<$text text={{!!_canonical_uri}}/>''

If this message doesn't disappear you may be using a browser that doesn't support external text in this configuration. See http://tiddlywiki.com/#ExternalText

MissingTiddler/Hint: Missing tiddler "<$text text=<>/>" - click {{$:/core/images/edit-button}} to create diff --git a/languages/ko-KR/Misc.multids b/languages/ko-KR/Misc.multids index d9307f959..5d477b5bf 100644 --- a/languages/ko-KR/Misc.multids +++ b/languages/ko-KR/Misc.multids @@ -22,6 +22,8 @@ Exporters/CsvFile: CSV 파일 Exporters/JsonFile: JSON 파일 Exporters/StaticRiver: 정적 HTML Exporters/TidFile: ".tid" 파일 +InternalJavaScriptError/Title: 내부 자바스크립트 오류 +InternalJavaScriptError/Hint: 아이 창피해. 브라우저를 새로 고쳐 TiddlyWiki를 다시 시작할 것을 권장합니다 InvalidFieldName: "<$text text=<>/>" 필드 이름에 잘못된 문자가 있습니다. 필드는 소문자, 숫자 및 밑줄 문자 (`_`), 하이픈 (`-`) 및 마침표 (`.`)만을 포함할 수 있습니다. MissingTiddler/Hint: "<$text text=<>/>" 티들러가 없습니다 - 만드려면 {{$:/core/images/edit-button}}을 클릭하세요 OfficialPluginLibrary: 공식 ~TiddlyWiki 플러그인 라이브러리