From b92bb73d91e909bb66120bca70420dcb2d7e8397 Mon Sep 17 00:00:00 2001 From: Chris Lemaire Date: Mon, 1 Jul 2024 17:12:13 +0200 Subject: [PATCH] [collab/gh/gl] Camelcase bundle property names GitOrigin-RevId: a635014eef2a3d8a6df2101d05dbe1b68df5a478 --- .../messages/CollaborationToolsBundle.properties | 4 ++-- plugins/github/resources/messages/GithubBundle.properties | 4 ++-- .../ui/details/GHPRStatusChecksComponentFactory.kt | 8 ++++---- plugins/gitlab/resources/messages/GitLabBundle.properties | 2 +- ...tLabMergeRequestDetailsStatusChecksComponentFactory.kt | 6 +++--- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/platform/collaboration-tools/resources/messages/CollaborationToolsBundle.properties b/platform/collaboration-tools/resources/messages/CollaborationToolsBundle.properties index 03277bec354f..3e065e8e7e31 100644 --- a/platform/collaboration-tools/resources/messages/CollaborationToolsBundle.properties +++ b/platform/collaboration-tools/resources/messages/CollaborationToolsBundle.properties @@ -109,8 +109,8 @@ review.details.status.reviewer.wait.for.updates={0} is waiting for updates review.details.view.timeline.action=View Timeline -review.details.resolve-conflicts.error.merge-in-progress=Merge is already in progress -review.details.resolve-conflicts.error.details-not-loaded=Details have not finished loading +review.details.resolveConflicts.error.mergeInProgress=Merge is already in progress +review.details.resolveConflicts.error.detailsNotLoaded=Details have not finished loading review.details.resolve-conflicts.head=Source review.details.resolve-conflicts.base=Target diff --git a/plugins/github/resources/messages/GithubBundle.properties b/plugins/github/resources/messages/GithubBundle.properties index f07826bc2ef0..bec0b202ddc2 100644 --- a/plugins/github/resources/messages/GithubBundle.properties +++ b/plugins/github/resources/messages/GithubBundle.properties @@ -235,8 +235,8 @@ pull.request.adding.reviewers=Adding reviewers pull.request.removing.reviewers=Removing reviewers pull.request.adjustment.failed=Failed to adjust the list -pull.request.resolve-conflicts.error.repository-not-found={0} repository not found -pull.request.resolve-conflicts.error.remote-not-found="{0} remote not found: {1} +pull.request.resolveConflicts.error.repositoryNotFound={0} repository not found +pull.request.resolveConflicts.error.remoteNotFound="{0} remote not found: {1} group.Github.PullRequest.Details.Commit.Tree.ViewOptions.text=View Options #state diff --git a/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/details/GHPRStatusChecksComponentFactory.kt b/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/details/GHPRStatusChecksComponentFactory.kt index 6cb730aac4e2..27dc67fb627b 100644 --- a/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/details/GHPRStatusChecksComponentFactory.kt +++ b/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/details/GHPRStatusChecksComponentFactory.kt @@ -96,10 +96,10 @@ internal object GHPRStatusChecksComponentFactory { requestOrError.bimap( ifLeft = { when (it) { - is MergeInProgress -> CollaborationToolsBundle.message("review.details.resolve-conflicts.error.merge-in-progress") - is DetailsNotLoaded -> CollaborationToolsBundle.message("review.details.resolve-conflicts.error.details-not-loaded") - is RepositoryNotFound -> GithubBundle.message("pull.request.resolve-conflicts.error.repository-not-found", it.baseOrHead.text) - is RemoteNotFound -> GithubBundle.message("pull.request.resolve-conflicts.error.remote-not-found", it.baseOrHead.text, it.coordinates.getWebURI()) + is MergeInProgress -> CollaborationToolsBundle.message("review.details.resolveConflicts.error.mergeInProgress") + is DetailsNotLoaded -> CollaborationToolsBundle.message("review.details.resolveConflicts.error.detailsNotLoaded") + is RepositoryNotFound -> GithubBundle.message("pull.request.resolveConflicts.error.repositoryNotFound", it.baseOrHead.text) + is RemoteNotFound -> GithubBundle.message("pull.request.resolveConflicts.error.remoteNotFound", it.baseOrHead.text, it.coordinates.getWebURI()) } }, ifRight = { request -> diff --git a/plugins/gitlab/resources/messages/GitLabBundle.properties b/plugins/gitlab/resources/messages/GitLabBundle.properties index 1ed7f45945d7..df6a92d36095 100644 --- a/plugins/gitlab/resources/messages/GitLabBundle.properties +++ b/plugins/gitlab/resources/messages/GitLabBundle.properties @@ -43,7 +43,7 @@ merge.request.on.branch.out.of.sync=Merge request !{0} exists for current branch merge.request.on.branch.error=Merge request !{0} exists for current branch {1}, but merge request details loading failed merge.request.on.branch.loading=Loading details for merge request !{0} -merge.request.resolve-conflicts.error.source-project-not-found=The source project is private or does not exist +merge.request.resolveConflicts.error.sourceProjectNotFound=The source project is private or does not exist action.GitLab.Merge.Request.Show.In.Toolwindow.text=Show Merge Request in Tool Window action.GitLab.Merge.Request.Branch.Update.text=Update to Enable Review Mode\u2026 diff --git a/plugins/gitlab/src/org/jetbrains/plugins/gitlab/mergerequest/ui/details/GitLabMergeRequestDetailsStatusChecksComponentFactory.kt b/plugins/gitlab/src/org/jetbrains/plugins/gitlab/mergerequest/ui/details/GitLabMergeRequestDetailsStatusChecksComponentFactory.kt index e29f93dc7ae4..839ba17ded45 100644 --- a/plugins/gitlab/src/org/jetbrains/plugins/gitlab/mergerequest/ui/details/GitLabMergeRequestDetailsStatusChecksComponentFactory.kt +++ b/plugins/gitlab/src/org/jetbrains/plugins/gitlab/mergerequest/ui/details/GitLabMergeRequestDetailsStatusChecksComponentFactory.kt @@ -85,9 +85,9 @@ internal object GitLabMergeRequestDetailsStatusChecksComponentFactory { requestOrError.bimap( ifLeft = { when (it) { - is MergeInProgress -> CollaborationToolsBundle.message("review.details.resolve-conflicts.error.merge-in-progress") - is DetailsNotLoaded -> CollaborationToolsBundle.message("review.details.resolve-conflicts.error.details-not-loaded") - is SourceRepositoryNotFound -> GitLabBundle.message("merge.request.resolve-conflicts.error.source-project-not-found") + is MergeInProgress -> CollaborationToolsBundle.message("review.details.resolveConflicts.error.mergeInProgress") + is DetailsNotLoaded -> CollaborationToolsBundle.message("review.details.resolveConflicts.error.detailsNotLoaded") + is SourceRepositoryNotFound -> GitLabBundle.message("merge.request.resolveConflicts.error.sourceProjectNotFound") } }, ifRight = { request ->