Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: rename NDMF Error Report to NDMF Console #222

Merged
merged 6 commits into from
May 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Workaround VRCSDK bug where stale PhysBones state could be retained over play mode transitions (#231)

### Changed
- Renamed `NDMF Error Report` to `NDMF Console` (#222)
- Changed Japanese strings a bit (#222)

### Removed

Expand Down
13 changes: 7 additions & 6 deletions Editor/ErrorReporting/UI/ErrorReportWindow.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ namespace nadena.dev.ndmf.ui

#endregion

// Note: Due to historical reason, "NDMF Console" is internally called "Error Report".
public sealed class ErrorReportWindow : EditorWindow
{
// Disables displaying the error report window (for tests)
Expand Down Expand Up @@ -207,7 +208,7 @@ private void SetupSelector()
/// <summary>
/// Shows the error report window, displaying the last error report generated.
/// </summary>
[MenuItem("Tools/NDM Framework/Show Error Report")]
[MenuItem("Tools/NDM Framework/Show NDMF Console")]
public static void ShowErrorReportWindow()
{
if (Application.isBatchMode || DISABLE_WINDOW) return; // headless unit tests
Expand Down Expand Up @@ -298,7 +299,7 @@ public static void ShowReport(ErrorReport report)
if (Application.isBatchMode || DISABLE_WINDOW) return; // headless unit tests

ErrorReportWindow wnd = GetWindow<ErrorReportWindow>();
wnd.titleContent = new GUIContent("NDMF Error Report");
wnd.titleContent = new GUIContent("NDMF Console");
wnd.CurrentReport = report;
wnd.Show();
}
Expand All @@ -312,23 +313,23 @@ public static void ShowReport(GameObject avatarRoot)
if (Application.isBatchMode || avatarRoot == null || DISABLE_WINDOW) return;

ErrorReportWindow wnd = GetWindow<ErrorReportWindow>();
wnd.titleContent = new GUIContent("NDMF Error Report");
wnd.titleContent = new GUIContent("NDMF Console");
wnd.CurrentAvatar = avatarRoot;
wnd.Show();
}

[MenuItem("GameObject/NDM Framework/Show Error Report", false)]
[MenuItem("GameObject/NDM Framework/Show NDMF Console", false)]
private static void ShowCurrentAvatarErrorReport()
{
if (Selection.activeGameObject == null) return;

ShowReport(Selection.activeGameObject);
}

[MenuItem("GameObject/NDM Framework/Show Error Report", true)]
[MenuItem("GameObject/NDM Framework/Show NDMF Console", true)]
private static bool ShowCurrentAvatarErrorReportValidation()
{
return Selection.activeGameObject != null && RuntimeUtil.IsAvatarRoot(Selection.activeGameObject.transform);
}
}
}
}
6 changes: 3 additions & 3 deletions Editor/UI/Localization/en-US.po
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ msgid "ErrorReport:AvatarPrefix"
msgstr "Avatar: "

msgid "ErrorReport:Title"
msgstr "Error Report"
msgstr "NDMF Console"

msgid "ErrorReport:HintFoldout"
msgstr "Help me fix it!"
Expand All @@ -15,7 +15,7 @@ msgid "ErrorReport:TestBuild"
msgstr "Perform Test Build"

msgid "ErrorReport:NoErrors"
msgstr "No errors to report!"
msgstr "No informations to report!"

msgid "ErrorReport:NoAvatarSelected"
msgstr "No avatar selected."
Expand All @@ -33,4 +33,4 @@ msgid "InternalError:StackTraceFoldout"
msgstr "Show Stack Trace (please include with bug reports!)"

msgid "AvatarProcessor:ProcessingFailed"
msgstr "There were errors processing the avatar. Check the error report for details."
msgstr "There were errors processing the avatar. Check the NDMF Console for details."
8 changes: 4 additions & 4 deletions Editor/UI/Localization/ja-JP.po
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ msgstr ""
"Language: ja-JP\n"

msgid "ErrorReport:Title"
msgstr "エラー表示"
msgstr "NDMFコンソール"

msgid "ErrorReport:HintFoldout"
msgstr "直すには?"
Expand All @@ -12,10 +12,10 @@ msgid "ErrorReport:TestBuild"
msgstr "テストビルドを実行"

msgid "ErrorReport:NoErrors"
msgstr "エラーがありません!"
msgstr "表示する情報は特にありません。"

msgid "ErrorReport:NoAvatarSelected"
msgstr "アバターが選択されていません"
msgstr "アバターが選択されていません"

msgid "ErrorReport:Unbuilt"
msgstr "アバターはまだビルドされていません。"
Expand All @@ -30,4 +30,4 @@ msgid "InternalError:StackTraceFoldout"
msgstr "スタックトレースを表示(バグ報告に添付してください!)"

msgid "AvatarProcessor:ProcessingFailed"
msgstr "アバター処理中にエラーが発生しました。詳しくはエラー表示をご確認ください。"
msgstr "アバター処理中にエラーが発生しました。詳しくはNDMFコンソールをご確認ください。"