Localization Progress

Fixed weird GM bug again

Author: NordLandeW

datafiles/lang/zh-cn.json

@@ -19,13 +19,54 @@
         "FMOD_load_err" : "FMOD 未能正确加载。所有音乐相关功能将无法正常运作。请检查文件完整性。",
         "FMOD_create_sys_err" : "FMOD 创建系统失败。\n 错误信息：",
         "autosave_complete" : "自动保存项目完毕。",
+        "autosave_enable" : "自动保存已开启。",
+        "autosave_disable" : "自动保存已关闭。",
         "fullscreen_warn" : "在全屏模式下使用会弹出窗口的功能键是危险的操作,某些情况下可能会导致程序无法响应或谱面丢失。这个问题暂时无法修复。请关闭全屏或使用自动保存功能。",
         "screenshot_save" : "已保存截图到:",
         "autoupdate_warn" : "未收取到 DyNode 的任何正式版本。",
         "autoupdate_err" : "更新检查错误。请检查与 Github 页面的网络连通性。",
         "autoupdate_found_1" : "收取到新版本 DyNode：",
         "autoupdate_found_2" : "前往更新页面",
+        "anno_project_load_complete" : "打开项目完毕。",
+        "anno_project_save_complete" : "项目保存完毕。",
         "anno_prefix_warn" : "警告",
-        "anno_prefix_err" : "错误"
+        "anno_prefix_err" : "错误",
+        "anno_adjust_enabled" : "开启",
+        "anno_adjust_disabled" : "关闭",
+        "anno_debug_info" : "调试信息",
+        "anno_show_bar" : "以 Bar 代替 Time 显示",
+        "anno_show_bar_warn" : "你还未设置全局 Bar Per Minute 与 Offset 。无法切换 Bar/Time 显示。\n使用 F6 即可进行设置。",
+        "anno_hide_scoreboard" : "编辑模式下隐藏分数显示",
+        "anno_particles_effect" : "粒子效果",
+        "anno_hitsound" : "打击音",
+        "anno_switch_sidetype" : "切换侧面类型至：",
+        "anno_switch_sidetype_warn" : "你只有正在编辑侧面才可以切换侧面类型。",
+        "anno_fade_other_notes" : "透明化非编辑侧音符",
+        "anno_music_speed" : "音乐倍速",
+        "anno_note_speed" : "下落速度",
+        "anno_note_speed_warn" : "你现在的下落速度为：x0.2。过低的下落速度可能导致严重的性能问题。",
+        "anno_switch_theme_to" : "已切换到主题",
+        "anno_export_complete" : "谱面导出完毕。",
+        "anno_music_load_complete" : "音乐加载完毕。",
+        "old_version_warn_1" : "检测到来自特定旧版本的项目。\n该谱面是否使用了从 .osu 中导入校时信息并添加了 64ms 的延迟？\n这个延迟在新的版本中建议被撤销。如果你选择“是”，则所有放置的 Note 和 Timing Point 都会被提前 64ms 。\n在调整之前我们建议你先对 .dyn 文件进行备份。你也可以在之后手动进行调整。\n这个警告不会出现第二遍。",
+        "new_project_warn" : "确定要创建新的工程吗？所有未保存的更改都将丢失。",
+        "box_add_offset" : "请输入你想要添加的全局时间偏移量（以毫秒记，正数代表增加延迟）。这将会影响所有的 Timing Points 和 Notes 所在的时间。",
+        "anno_add_offset_complete" : "全局时间偏移添加完毕。",
+        "box_set_global_bar_1" : "请输入自定义的全局 Bar Per Minute",
+        "box_set_global_bar_2" : "请输入用于 Bar 显示与导出的全局 Offset （毫秒）",
+        "anno_set_global_bar_complete" : "已更改全局 BarPM 与 Offset 至",
+        "anno_graph_not_exists" : "图片文件不存在。\n[scale, 0.8]路径：",
+        "anno_graph_load_err" : "图片文件读取失败。图片可能过大或损坏。",
+        "anno_music_load_err" : "音乐文件加载失败，可能原因为类型不支持或文件损坏。\nFMOD 错误信息：",
+        "anno_import_info_complete" : "导入谱面信息完毕。",
+        "box_set_chart_title" : "请输入新的谱面标题",
+        "box_q_osu_import_objects" : "是否导入 .osu 中的物件？（要进行转谱吗？）",
+        "box_q_clear_objects" : "是否清除所有原谱面物件？此操作不可撤销！",
+        "box_q_import_dymm_bpm" : "是否导入 Dynamaker Modified 谱面文件中的变 BPM 数据？",
+        "anno_chart_not_exists" : "谱面文件不存在。导入中止。",
+        "box_q_import_confirm" : "确认导入谱面？所有操作将不可撤销。",
+        "box_q_import_clear" : "是否清除所有原谱面物件？",
+        "box_q_import_info" : "是否导入谱面信息（标题、难度、Timing等）？",
+        "anno_import_chart_complete" : "导入谱面完毕。"
     }
 }

objects/objmain/Step_0.gml

@@ -18,24 +18,24 @@
     	switch_debug_info();
     if(keycheck_down_ctrl(ord("B"))) {
     	if(!chartBarUsed) {
-    		announcement_warning("你还未设置全局 Bar Per Minute 与 Offset 。无法切换 Bar/Time 显示。\n使用 F6 即可进行设置。");
+    		announcement_warning("anno_show_bar_warn");
     	}
     	else {
     		showBar = !showBar;
-    		announcement_adjust("以 Bar 代替 Time 显示", showBar);
+    		announcement_adjust("anno_show_bar", showBar);
     	}
     }
     if(keycheck_down(ord("P"))) {
     	hideScoreboard = !hideScoreboard;
-    	announcement_adjust("编辑模式下隐藏分数显示", hideScoreboard);
+    	announcement_adjust("anno_hide_scoreboard", hideScoreboard);
     }
     if(keycheck_down(ord("O"))) {
     	particlesEnabled = !particlesEnabled;
-    	announcement_adjust("粒子效果", particlesEnabled);
+    	announcement_adjust("anno_particles_effect", particlesEnabled);
     }
     if(keycheck_down_ctrl(ord("M"))) {
     	hitSoundOn = !hitSoundOn;
-    	announcement_adjust("打击音", hitSoundOn);
+    	announcement_adjust("anno_hitsound", hitSoundOn);
     }
 
     if(keycheck_down_ctrl(ord("T")))
@@ -59,15 +59,15 @@
     		}
 
 	    	chartSideType[_side] = _type;
-	    	announcement_play("切换侧面类型至："+chartSideType[_side]);
+	    	announcement_play("anno_switch_sidetype"+chartSideType[_side]);
     	}
     	else {
-    		announcement_warning("你只有正在编辑侧面才可以切换侧面类型。");
+    		announcement_warning("anno_switch_sidetype_warn");
     	}
     }
     if(keycheck_down(ord("F"))) {
     	fadeOtherNotes = !fadeOtherNotes;
-    	announcement_adjust("透明化非编辑侧音符", fadeOtherNotes);
+    	announcement_adjust("anno_fade_other_notes", fadeOtherNotes);
     }
 
     if(keycheck_down(vk_enter)) {		// Replay Mode

objects/objmain/Step_1.gml

@@ -16,7 +16,7 @@ var _music_resync_request = false;
         musicSpeed = max(musicSpeed, 0.1);
         FMODGMS_Chan_Set_Pitch(channel, musicSpeed);
 
-        announcement_play("音乐倍速：x" + string_format(musicSpeed, 1, 1));
+        announcement_play(i18n_get("anno_music_speed") + ": x" + string_format(musicSpeed, 1, 1));
     }
 
 // Keyboard Time & Speed Adjust
@@ -26,10 +26,10 @@ var _music_resync_request = false;
     animTargetPlaybackSpeed += 0.1 * _spdchange;
 
     if(_spdchange != 0) {
-    	announcement_play("下落速度：x" + string_format(animTargetPlaybackSpeed, 1, 2));
+    	announcement_play(i18n_get("anno_note_speed") + ": x" + string_format(animTargetPlaybackSpeed, 1, 2));
 
     	if(animTargetPlaybackSpeed == 0.2 && _spdchange < 0)
-    		announcement_warning("你现在的下落速度为：x0.2。过低的下落速度可能导致严重的性能问题。");
+    		announcement_warning("anno_note_speed_warn");
     }
 
     playbackSpeed = lerp_a(playbackSpeed, animTargetPlaybackSpeed, animSpeed);

objects/objmanager/Create_0.gml

@@ -66,7 +66,7 @@ gpu_set_tex_filter(true);
 // DyCore Initialization
 
 // if(DyCore_Init() != "success") {
-//     show_error("DyCore 核心初始化失败。", true);
+//     show_error_i18n("DyCore 核心初始化失败。", true);
 // }
 
 // DerpXML Initialization

objects/objuistringinput/Step_0.gml

@@ -6,5 +6,5 @@ event_inherited();
 var _inbound = mouse_inbound(x, y, x+maxWidth, y+scriHeight*2);
 
 if(_inbound && mouse_isclick_l()) {
-	input = get_string(i18n_get(description), "");
+	input = get_string_i18n(i18n_get(description), "");
 }

rooms/rmain/rmain.yy

@@ -303,11 +303,11 @@ function timing_point_add(_t, _l, _b, record = false) {
 }
 
 function timing_point_create(record = false) {
-	var _time = string_digits(get_string("请输入该 Timing Point 的 offset（毫秒）：", ""));
+	var _time = string_digits(get_string_i18n("请输入该 Timing Point 的 offset（毫秒）：", ""));
 	if(_time == "") return;
-	var _bpm = string_real(get_string("请输入 BPM ：", ""));
+	var _bpm = string_real(get_string_i18n("请输入 BPM ：", ""));
 	if(_bpm == "") return;
-	var _meter = string_digits(get_string("请输入节拍（x/4）：", ""));
+	var _meter = string_digits(get_string_i18n("请输入节拍（x/4）：", ""));
 	if(_meter == "") return;
 
 	_time = real(_time);

scripts/scrEditor/scrEditor.gml

@@ -52,24 +52,24 @@ function map_load(_file = "") {
     if(_file == "") return;
 
     if(!file_exists(_file)) {
-        announcement_error("谱面文件不存在。导入中止。");
+        announcement_error(i18n_get("anno_chart_not_exists"));
         return;
     }
 
-    var _confirm = _direct? true:show_question("确认导入谱面？所有操作将不可撤销。");
+    var _confirm = _direct? true:show_question_i18n("box_q_import_confirm");
     if(!_confirm) return;
-    var _clear = _direct? true:show_question("是否清除所有原谱面物件？");
+    var _clear = _direct? true:show_question_i18n("box_q_import_clear");
     if(_clear) note_delete_all();
 
-    var _import_info = show_question("是否导入谱面信息（标题、难度、Timing等）？");
+    var _import_info = show_question_i18n("box_q_import_info");
 
     if(filename_ext(_file) == ".xml")
         map_import_xml(_file, _import_info);
 
     objManager.chartPath = _file;
 
     show_debug_message("Import map sucessfully.");
-    announcement_play("导入谱面完毕。");
+    announcement_play("anno_import_chart_complete");
 }
 
 function map_import_xml(_file, _import_info) {
@@ -120,7 +120,7 @@ function map_import_xml(_file, _import_info) {
 	_import_fun(_main.m_notesRight.m_notes.CMapNoteAsset, 2);
 
 	if(variable_struct_exists(_main, "m_argument")) {
-		_import_tp = show_question("是否导入 Dynamaker Modified 谱面文件中的变 BPM 数据？");
+		_import_tp = show_question_i18n(i18n_get("box_q_import_dymm_bpm"));
 		var _bpms = _main.m_argument.m_bpmchange.CBpmchange;
 		if(!is_array(_bpms)) _bpms = [_bpms];
 		for(var i=0, l=array_length(_bpms); i<l; i++) {
@@ -212,8 +212,8 @@ function map_import_osu() {
 
     if(_file == "") return;
 
-    var _import_hitobj = show_question("是否导入 .osu 中的物件？（要进行转谱吗？）");
-    var _clear_notes = show_question("是否清除所有原谱面物件？此操作不可撤销！");
+    var _import_hitobj = show_question_i18n(i18n_get("box_q_osu_import_objects"));
+    var _clear_notes = show_question_i18n(i18n_get("box_q_clear_objects"));
     if(_clear_notes) note_delete_all();
     var _delay_time = 0;
 
@@ -283,11 +283,11 @@ function map_import_osu() {
     timing_point_sort();
     note_sort_all();
 
-    announcement_play("导入谱面信息完毕。", 1000);
+    announcement_play("anno_import_info_complete", 1000);
 }
 
 function map_set_title() {
-	var _title = get_string("请输入新的谱面标题：", objMain.chartTitle);
+	var _title = get_string_i18n(i18n_get("box_set_chart_title") + ": ", objMain.chartTitle);
 
 	if(_title == "") return;
 
@@ -315,7 +315,7 @@ function music_load(_file = "") {
         // music = FMODGMS_Snd_LoadSound(_file);
         if(music < 0) {
         	show_error("Load Music Failed. \n FMOD Error Message: " + FMODGMS_Util_GetErrorMessage(), false);
-        	announcement_error("音乐文件加载失败，可能原因为类型不支持或文件损坏。\nFMOD 错误信息："+FMODGMS_Util_GetErrorMessage());
+        	announcement_error(i18n_get("anno_music_load_err")+FMODGMS_Util_GetErrorMessage());
         	music = undefined;
         	return;
         }
@@ -334,7 +334,7 @@ function music_load(_file = "") {
     objManager.musicPath = _file;
     show_debug_message("Load sucessfully.");
 
-    announcement_play("音乐加载完毕。", 1000);
+    announcement_play("anno_music_load_complete", 1000);
 }
 
 function image_load(_file = "") {
@@ -345,13 +345,13 @@ function image_load(_file = "") {
     if(_file == "") return;
 
     if(!file_exists(_file)) {
-        announcement_error("图片文件不存在。\n[scale, 0.8]路径："+_file);
+        announcement_error(i18n_get("anno_graph_not_exists")+_file);
         return;
     }
 
     var _spr = sprite_add(_file, 1, 0, 0, 0, 0);
     if(_spr < 0) {
-        announcement_error("图片文件读取失败。图片可能过大或损坏。");
+        announcement_error("anno_graph_load_err");
         return;
     }
 
@@ -451,7 +451,7 @@ function map_export_xml() {
 
 	objManager.chartPath = _file;
 
-	announcement_play("谱面导出完毕。");
+	announcement_play("anno_export_complete");
 }
 
 function map_get_struct() {
@@ -532,10 +532,10 @@ function map_get_alt_title() {
 
 function map_set_global_bar() {
 
-	var _barpm = get_string("请输入自定义的全局 Bar Per Minute :", "");
+	var _barpm = get_string_i18n(i18n_get("box_set_global_bar_1")+ " :", "");
 	_barpm = string_real(_barpm);
 	if(_barpm == "") return;
-	var _offset = string_digits(get_string("请输入用于 Bar 显示与导出的全局 Offset （毫秒）:", ""));
+	var _offset = string_digits(get_string_i18n(i18n_get("box_set_global_bar_2")+":", ""));
 	if(_offset == "") return;
 	with(objMain) {
 		chartBarPerMin = real(_barpm);
@@ -544,15 +544,15 @@ function map_set_global_bar() {
 		chartBarOffset = time_to_bar(chartTimeOffset);
 	}
 
-	announcement_play("已更改全局 BarPM 与 Offset 至："+_barpm+"/"+string(_offset));
+	announcement_play(i18n_get("anno_set_global_bar_complete") + ": " +_barpm+"/"+string(_offset));
 
 }
 
 function map_add_offset(_offset = "", record = false) {
 	var _record = false;
 	if(_offset == "") {
 		var _nega = 1;
-		_offset = get_string("请输入你想要添加的全局时间偏移量（以毫秒记，正数代表增加延迟）。这将会影响所有的 Timing Points 和 Notes 所在的时间。", "");
+		_offset = get_string_i18n(i18n_get("box_add_offset"), "");
 		if(_offset == "") return;
 		if(string_char_at(_offset, 1) == "-")
 			_nega = -1;
@@ -573,7 +573,7 @@ function map_add_offset(_offset = "", record = false) {
 	}
 	notes_array_update();
 
-	announcement_play("全局时间偏移添加完毕。");
+	announcement_play("anno_add_offset_complete");
 
 	if(record)
 		operation_step_add(OPERATION_TYPE.OFFSET, _offset, -1);
@@ -622,14 +622,14 @@ function project_load(_file = "") {
     ///// Old version workaround
 
 	    if(_contents.version < "v0.1.5") {
-	    	var _question = show_question("检测到来自特定旧版本的项目。\n该谱面是否使用了从 .osu 中导入校时信息并添加了 64ms 的延迟？\n这个延迟在新的版本中建议被撤销。如果你选择“是”，则所有放置的 Note 和 Timing Point 都会被提前 64ms 。\n在调整之前我们建议你先对 .dyn 文件进行备份。你也可以在之后手动进行调整。\n这个警告不会出现第二遍。");
+	    	var _question = show_question_i18n(i18n_get("old_version_warn_1"));
 			if(_question)
 				map_add_offset(-64, true);
 	    }
 
 	/////
 
-    announcement_play("打开项目完毕。");
+    announcement_play("anno_project_load_complete");
 
     return 1;
 }
@@ -663,14 +663,14 @@ function project_save_as(_file = "") {
 
 	objManager.projectPath = _file;
 
-	announcement_play("项目保存完毕。");
+	announcement_play("anno_project_save_complete");
 
 	return 1;
 }
 
 function project_new() {
 
-	var _confirm = show_question("确定要创建新的工程吗？所有未保存的更改都将丢失。");
+	var _confirm = show_question_i18n(i18n_get("new_project_warn"));
 	if(!_confirm) return;
 
 	with(objManager) {
@@ -740,7 +740,7 @@ function theme_next() {
 	if(instance_exists(objMain))
 		objMain.themeColor = global.themes[global.themeAt].color;
 
-	announcement_play("已切换到主题 [[" + global.themes[global.themeAt].title + "]", 1000);
+	announcement_play(i18n_get("anno_switch_theme_to") + " [[" + global.themes[global.themeAt].title + "]", 1000);
 }
 
 function theme_get() {
@@ -772,7 +772,7 @@ function announcement_error(str, time = 8000) {
 
 function announcement_adjust(str, val) {
 	str = i18n_get(str);
-	announcement_play(str + "：" + (val?"开启":"关闭"));
+	announcement_play(str + "：" + i18n_get(val?"anno_adjust_enabled":"anno_adjust_disabled"));
 }
 
 #endregion
@@ -826,18 +826,18 @@ function save_config() {
 function switch_debug_info() {
 	with(objMain) {
 		showDebugInfo = !showDebugInfo;
-		announcement_play("调试信息："+(showDebugInfo?"打开":"关闭"));
+		announcement_adjust("anno_debug_info", showDebugInfo);
 	}
 }
 
 function switch_autosave() {
 	with(objManager) {
 		if(!global.autosave) {
-			announcement_play("自动保存已开启。", 2000);
+			announcement_play("autosave_enable", 2000);
 			time_source_start(tsAutosave);
 		}
 		else {
-			announcement_play("自动保存已关闭。", 2000);
+			announcement_play("autosave_disable", 2000);
 			time_source_stop(tsAutosave);
 		}
 		global.autosave = !global.autosave;