From badd10fd3553c4bb455ad33ed65681c28179cd30 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Fri, 4 Aug 2023 07:14:18 +1000 Subject: [PATCH] Revert "Allow the user to tell the difference between a helpful open button and a generic one (#2442)" (#2474) This reverts commit 141210595871aeed971be729cb1fc1bb77f799b6. --- .../blueocean/service/embedded/BlueOceanUrlObjectImpl.java | 6 +----- .../jenkins/blueocean/service/embedded/Messages.properties | 3 +-- .../blueocean/service/embedded/Messages_ko.properties | 2 -- .../blueocean/service/embedded/Messages_ru.properties | 2 -- .../blueocean/service/embedded/Messages_zh_CN.properties | 2 -- 5 files changed, 2 insertions(+), 13 deletions(-) diff --git a/blueocean-rest-impl/src/main/java/io/jenkins/blueocean/service/embedded/BlueOceanUrlObjectImpl.java b/blueocean-rest-impl/src/main/java/io/jenkins/blueocean/service/embedded/BlueOceanUrlObjectImpl.java index 7d78fa400ce..59fc62d6e0f 100644 --- a/blueocean-rest-impl/src/main/java/io/jenkins/blueocean/service/embedded/BlueOceanUrlObjectImpl.java +++ b/blueocean-rest-impl/src/main/java/io/jenkins/blueocean/service/embedded/BlueOceanUrlObjectImpl.java @@ -23,11 +23,7 @@ public BlueOceanUrlObjectImpl(ModelObject modelObject) { @Override public @NonNull String getDisplayName() { - if (this.mappedUrl.equals(BlueOceanUrlMapperImpl.getLandingPagePath())) { - return Messages.BlueOceanUrlAction_DisplayName(); - } else { - return Messages.BlueOceanUrlAction_GenericDisplayName(); - } + return Messages.BlueOceanUrlAction_DisplayName(); } @Override diff --git a/blueocean-rest-impl/src/main/resources/io/jenkins/blueocean/service/embedded/Messages.properties b/blueocean-rest-impl/src/main/resources/io/jenkins/blueocean/service/embedded/Messages.properties index 31d274fdc92..ce7f84d6868 100644 --- a/blueocean-rest-impl/src/main/resources/io/jenkins/blueocean/service/embedded/Messages.properties +++ b/blueocean-rest-impl/src/main/resources/io/jenkins/blueocean/service/embedded/Messages.properties @@ -1,2 +1 @@ -BlueOceanUrlAction.DisplayName=Open Blue Ocean -BlueOceanUrlAction.GenericDisplayName=Open Blue Ocean Homepage +BlueOceanUrlAction.DisplayName=Open Blue Ocean \ No newline at end of file diff --git a/blueocean-rest-impl/src/main/resources/io/jenkins/blueocean/service/embedded/Messages_ko.properties b/blueocean-rest-impl/src/main/resources/io/jenkins/blueocean/service/embedded/Messages_ko.properties index 9b11469ce79..453f4d85c7c 100644 --- a/blueocean-rest-impl/src/main/resources/io/jenkins/blueocean/service/embedded/Messages_ko.properties +++ b/blueocean-rest-impl/src/main/resources/io/jenkins/blueocean/service/embedded/Messages_ko.properties @@ -1,3 +1 @@ BlueOceanUrlAction.DisplayName=\ube14\ub8e8 \uc624\uc158 \uc5f4\uae30 -# I can't translate this but don't want to cause a language regression so leave as it was in other languages -BlueOceanUrlAction.GenericDisplayName=\ube14\ub8e8 \uc624\uc158 \uc5f4\uae30 diff --git a/blueocean-rest-impl/src/main/resources/io/jenkins/blueocean/service/embedded/Messages_ru.properties b/blueocean-rest-impl/src/main/resources/io/jenkins/blueocean/service/embedded/Messages_ru.properties index c215b3942fc..d82ae2922e2 100644 --- a/blueocean-rest-impl/src/main/resources/io/jenkins/blueocean/service/embedded/Messages_ru.properties +++ b/blueocean-rest-impl/src/main/resources/io/jenkins/blueocean/service/embedded/Messages_ru.properties @@ -1,4 +1,2 @@ #X-Generator: crowdin.com BlueOceanUrlActionImpl.DisplayName=\u041e\u0442\u043a\u0440\u044b\u0442\u044c Blue Ocean -# I can't translate this but don't want to cause a language regression so leave as it was in other languages -BlueOceanUrlAction.GenericDisplayName=\u041e\u0442\u043a\u0440\u044b\u0442\u044c Blue Ocean diff --git a/blueocean-rest-impl/src/main/resources/io/jenkins/blueocean/service/embedded/Messages_zh_CN.properties b/blueocean-rest-impl/src/main/resources/io/jenkins/blueocean/service/embedded/Messages_zh_CN.properties index f9364549c86..ac49902807f 100644 --- a/blueocean-rest-impl/src/main/resources/io/jenkins/blueocean/service/embedded/Messages_zh_CN.properties +++ b/blueocean-rest-impl/src/main/resources/io/jenkins/blueocean/service/embedded/Messages_zh_CN.properties @@ -21,5 +21,3 @@ # THE SOFTWARE. BlueOceanUrlAction.DisplayName=\u6253\u5F00 Blue Ocean -# I can't translate this but don't want to cause a language regression so leave as it was in other languages -BlueOceanUrlAction.GenericDisplayName=\u6253\u5F00 Blue Ocean