From bc5e30ff177e3e560be974663dde0f6a71b35111 Mon Sep 17 00:00:00 2001 From: Rayawa <73282963+Rayawa@users.noreply.github.com> Date: Mon, 6 Jun 2022 08:25:48 +0800 Subject: [PATCH 1/2] Update lang files --- configs/lang/en-us.json5 | 53 ---------------------------------- configs/lang/en-us.toml | 29 ++++++++++++------- configs/lang/en-us_new.toml | 55 ----------------------------------- configs/lang/zh-CN.json5 | 57 ------------------------------------- 4 files changed, 18 insertions(+), 176 deletions(-) delete mode 100644 configs/lang/en-us.json5 delete mode 100644 configs/lang/en-us_new.toml delete mode 100644 configs/lang/zh-CN.json5 diff --git a/configs/lang/en-us.json5 b/configs/lang/en-us.json5 deleted file mode 100644 index 134983b..0000000 --- a/configs/lang/en-us.json5 +++ /dev/null @@ -1,53 +0,0 @@ -{ - 'main': { - 'version.now_on': 'Difficult Rocket is running on Python Vision', - 'version.need3+': 'Difficult Rocket need Python vision 3.0+', - 'version.best3.8+': 'Difficult Rocket is writen in Python {write_py_v}, and now is running on Python {py_v} may cause BUG', - 'lang.language': 'English (EN-US)', - 'logger.language': 'Logging language is: ', - 'logger.created': 'Log handler created', - 'logger.mkdir': 'logs/ folder not found, now created', - 'logger.main_done': 'Main log handler created ', - 'logger.logfile_name': 'Log file name :', - 'logger.logfile_level': 'Log file record level :', - 'logger.logfile_fmt': 'Log file record format :', - 'logger.logfile_datefmt': 'Log file date format :', - 'game_start.at': 'The main thread of the game starts with:' - }, - 'client': { - 'setup.done': 'Client load complete', - 'setup.use_time': 'Client load use: {} second', - 'setup.use_time_ns': 'Client load use: {} nano second' - }, - 'window': { - 'setup.done': 'Window load complete ', - 'setup.use_time': 'Window load use: {} second', - 'setup.use_time_ns': 'Window load use: {} nano second', - 'os.pid_is': 'Window\'s PID: {} PPID: {}', - 'button.been_press': 'The button is pressed, the current state of the button is:', - 'mouse.press_at': 'mouse was click at {} button is: {}', - 'mouse.release': 'mouse release at {} button is: {}', - 'mouse.RIGHT': 'right button', - 'mouse.LEFT': 'left button', - 'mouse.MIDDLE': 'middle button', - 'key.press': 'key {} | {} been press', - 'key.release': 'key {} | {} been release', - 'text.input': 'input text "{}"', - 'text.new_line': 'new line', - 'text.motion': 'text move {}', - 'text.motion_select': 'text select {}', - 'command.text': 'input command: {}', - 'message.text': 'input message: {}', - 'libs.local': 'using local pyglet, version: {}', - 'libs.outer': 'using global pyglet, version: {}\n(may cause bug)', - 'fonts.found': 'found fonts in font lib: {}' - }, - 'server': { - 'setup.done': 'Server load complete ', - 'os.pid_is': 'Server is using PID: {} PPID: {}' - }, - 'language': 'English' -} -/* -感谢@小咔er 帮我lazy的翻译 -*/ diff --git a/configs/lang/en-us.toml b/configs/lang/en-us.toml index e06b496..ed8b359 100644 --- a/configs/lang/en-us.toml +++ b/configs/lang/en-us.toml @@ -2,7 +2,7 @@ language = "English" [main] "version.now_on" = "Difficult Rocket is running on Python Vision" -"version.need3+" = "Difficult Rocket need Python vision 3.0+" +"version.need3+" = "Difficult Rocket depends on Python vision 3.0+" "version.best3.8+" = "Difficult Rocket is writen in Python {write_py_v}, and now is running on Python {py_v} may cause BUG" "lang.language" = "English (EN-US)" "logger.language" = "Logging language is: " @@ -16,17 +16,17 @@ language = "English" "game_start.at" = "The main thread of the game starts with:" [client] -"setup.done" = "Client load complete" -"setup.use_time" = "Client load use: {} second" -"setup.use_time_ns" = "Client load use: {} nano second" +"setup.done" = "Client loaded" +"setup.use_time" = "Client loading has used: {} second" +"setup.use_time_ns" = "Client loading has used: {} nano second" [window] -"setup.done" = "Window load complete " -"setup.use_time" = "Window load use: {} second" -"setup.use_time_ns" = "Window load use: {} nano second" +"setup.done" = "Window loaded" +"setup.use_time" = "Window loading has used: {} second" +"setup.use_time_ns" = "Window loading has used: {} nano second" "os.pid_is" = "Window's PID: {} PPID: {}" -"button.been_press" = "The button is pressed, the current state of the button is:" -"mouse.press_at" = "mouse was click at {} button is: {}" +"button.been_press" = "Button pressed, the current state of the button is:" +"mouse.press" = "mouse was click at {} button is: {}" "mouse.release" = "mouse release at {} button is: {}" "mouse.RIGHT" = "right button" "mouse.LEFT" = "left button" @@ -42,7 +42,14 @@ language = "English" "libs.local" = "using local pyglet, version: {}" "libs.outer" = "using global pyglet, version: {}\n(may cause bug)" "fonts.found" = "found fonts in font lib: {}" +"fonts.load" = "loading fonts: {}" +"game.input_stop" = ""console"" +"game.command_stop" = ""in game commands"" +"game.window_stop" = ""window"" +"game.stop_get" = "Received closing commands from {}, game closing" +"game.stop" = "game closing, saving data……" +"game.end" = "game closed" [server] -"setup.done" = "Server load complete " -"os.pid_is" = "Server is using PID: {} PPID: {}" +"setup.done" = "Server loaded " +"os.pid_is" = "Server PID: {} PPID: {}" diff --git a/configs/lang/en-us_new.toml b/configs/lang/en-us_new.toml deleted file mode 100644 index cad7024..0000000 --- a/configs/lang/en-us_new.toml +++ /dev/null @@ -1,55 +0,0 @@ -language = "English" - -[main] -"version.now_on" = "Difficult Rocket is running on Python Vision" -"version.need3+" = "Difficult Rocket need Python vision 3.0+" -"version.best3.8+" = "Difficult Rocket is writen in Python {write_py_v}, and now is running on Python {py_v} may cause BUG" -"lang.language" = "English (EN-US)" -"logger.language" = "Logging language is: " -"logger.created" = "Log handler created" -"logger.mkdir" = "logs/ folder not found, now created" -"logger.main_done" = "Main log handler created " -"logger.logfile_name" = "Log file name :" -"logger.logfile_level" = "Log file record level :" -"logger.logfile_fmt" = "Log file record format :" -"logger.logfile_datefmt" = "Log file date format :" -"game_start.at" = "The main thread of the game starts with:" - -[client] -"setup.done" = "Client load complete" -"setup.use_time" = "Client load use: {} second" -"setup.use_time_ns" = "Client load use: {} nano second" - -[window] -"setup.done" = "Window load complete " -"setup.use_time" = "Window load use: {} second" -"setup.use_time_ns" = "Window load use: {} nano second" -"os.pid_is" = "Window's PID: {} PPID: {}" -"button.been_press" = "The button is pressed, the current state of the button is:" -"mouse.press" = "鼠标在 {} 被按下，按键为：{}" -"mouse.release" = "mouse release at {} button is: {}" -"mouse.RIGHT" = "right button" -"mouse.LEFT" = "left button" -"mouse.MIDDLE" = "middle button" -"key.press" = "key {} | {} been press" -"key.release" = "key {} | {} been release" -"text.input" = "input text \"{}\"" -"text.new_line" = "new line" -"text.motion" = "text move {}" -"text.motion_select" = "text select {}" -"command.text" = "input command: {}" -"message.text" = "input message: {}" -"libs.local" = "using local pyglet, version: {}" -"libs.outer" = "using global pyglet, version: {}\n(may cause bug)" -"fonts.found" = "found fonts in font lib: {}" -"fonts.load" = "正在加载字体: {}" -"game.input_stop" = "控制台" -"game.command_stop" = "游戏内命令行" -"game.window_stop" = "窗口" -"game.stop_get" = "从{}传入关闭指令,关闭游戏中" -"game.stop" = "游戏正在关闭,保存数据中···" -"game.end" = "游戏已经关闭" - -[server] -"setup.done" = "Server load complete " -"os.pid_is" = "Server is using PID: {} PPID: {}" diff --git a/configs/lang/zh-CN.json5 b/configs/lang/zh-CN.json5 deleted file mode 100644 index 174fb5c..0000000 --- a/configs/lang/zh-CN.json5 +++ /dev/null @@ -1,57 +0,0 @@ -{ - 'main': { - 'version.now_on': '困难火箭的运行Python环境为', - 'version.need3+': '困难火箭需要Python3.0+的环境', - 'version.best3.8+': '困难火箭是在Python{write_py_v}的环境下编写的，目前正在运行在Python{py_v}的环境下，可能产生BUG', - 'lang.language': '简 体 中 文 （zh-cn）', - 'logger.language': '日志记录语言为：', - 'logger.created': '日志处理器创建完成', - 'logger.mkdir': 'logs/文件夹不存在，已经新建文件夹', - 'logger.main_done': '主日志处理器创建完成', - 'logger.logfile_name': '日志文件文件名：', - 'logger.logfile_level': '日志文件记录级别：', - 'logger.logfile_fmt': '日志文件记录格式：', - 'logger.logfile_datefmt': '日志文件日期格式：', - 'game_start.at': '游戏主线程开始于：' - }, - 'client': { - 'setup.done': '客户端载入完成', - 'setup.use_time': '客户端载入花费: {} 秒', - 'setup.use_time_ns': '客户端载入花费: {} 纳秒' - }, - 'window': { - 'setup.done': '游戏窗口载入完成', - 'setup.use_time': '游戏窗口载入消耗时间: {} 秒', - 'setup.use_time_ns': '游戏窗口载入消耗时间: {} 纳秒', - 'os.pid_is': '游戏窗口 PID: {} PPID: {}', - 'button.been_press': '按钮被按下，目前状态为：', - 'mouse.press': '鼠标在 {} 被按下，按键为：{}', - 'mouse.release': '鼠标在 {} 释放，按键为：{}', - 'mouse.RIGHT': '右键', - 'mouse.LEFT': '左键', - 'mouse.MIDDLE': '中键', - 'key.press': '按键 {} | {} 被按下', - 'key.release': '按键 {} | {} 被释放', - 'text.input': '输入字符 "{}"', - 'text.new_line': '换行', - 'text.motion': '光标移动 {}', - 'text.motion_select': '光标选择 {}', - 'command.text': '输入命令: {}', - 'message.text': '输入信息: {}', - 'libs.local': '正在使用本地 pyglet 库 版本为: {}', - 'libs.outer': '正在使用全局 pyglet 库 版本为: {}\n(可能会造成bug，因为本地库版本为2.0dev9)', - 'fonts.found': '在字体列表中找到以下字体库: {}', - 'fonts.load': '正在加载字体: {}', - 'game.input_stop': '控制台', - 'game.command_stop': '游戏内命令行', - 'game.window_stop': '窗口', - 'game.stop_get': '从{}传入关闭指令,关闭游戏中', - 'game.stop': '游戏正在关闭,保存数据中···', - 'game.end': '游戏已经关闭' - }, - 'server': { - 'setup.done': '服务端载入完成', - 'os.pid_is': '服务端 PID: {} PPID: {}' - }, - 'language': '简体中文' -} -- 2.45.2 From 874223602f299059b69a064218ebbc0c4f85a7a4 Mon Sep 17 00:00:00 2001 From: Rayawa <73282963+Rayawa@users.noreply.github.com> Date: Mon, 6 Jun 2022 08:38:49 +0800 Subject: [PATCH 2/2] Change files & Edit README --- README.md | 4 ++-- docs/README-cn.md | 2 +- test.md | 0 3 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 test.md diff --git a/README.md b/README.md index d233070..1e17433 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ ## 中文README请移步 [这里](/docs/README-cn.md) -> It's a Simple Rocket liked game build with Python (in short: rocket simulator) +> Difficult-rocket is a Simple Rocket liked game build with Python (in short: rocket simulator) ## Advantage @@ -70,8 +70,8 @@ - `toml` toml parser - `xmltodict`: translate data between xml and dict - `pyperclip`: paste board! +- [@Rayawa](https://github.com/Rayawa) : check mistake in docs & some transelates - [@rouxiao-you](https://github.com/ruoxiao-you) : translate chinese to English -- [@Rayawa](https://github.com/Rayawa) : check mistake in docs - [@Billchyi](https://github.com/Billchyi) : check mistake in docs ## Other links diff --git a/docs/README-cn.md b/docs/README-cn.md index ac4da70..91a9b39 100644 --- a/docs/README-cn.md +++ b/docs/README-cn.md @@ -67,8 +67,8 @@ - `toml`: toml解析器 - `xmltodict`: xml 与 dict 转换器 - `pyperclip`: 剪贴板! +- [@Rayawa](https://github.com/Rayawa) : 文档矫正&翻译部分lang - [@rouxiao-you](https://github.com/ruoxiao-you) : 翻译lang -- [@Rayawa](https://github.com/Rayawa) : 文档矫正 - [@Billchyi](https://github.com/Billchyi) : 文档矫正 ## 相关链接 diff --git a/test.md b/test.md deleted file mode 100644 index e69de29..0000000 -- 2.45.2