MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 15:19:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

[collab/gh/gl] Camelcase bundle property names

Browse Source 
GitOrigin-RevId: a635014eef2a3d8a6df2101d05dbe1b68df5a478
This commit is contained in:
Chris Lemaire
2024-07-01 17:12:13 +02:00
committed by intellij-monorepo-bot
parent 8fef59d67f
commit b92bb73d91
5 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
platform/collaboration-tools/resources/messages/CollaborationToolsBundle.properties
View File

@@ -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

4
plugins/github/resources/messages/GithubBundle.properties
View File

@@ -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

8
plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/details/GHPRStatusChecksComponentFactory.kt
View File

@@ -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 ->

2
plugins/gitlab/resources/messages/GitLabBundle.properties
View File

@@ -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

6
plugins/gitlab/src/org/jetbrains/plugins/gitlab/mergerequest/ui/details/GitLabMergeRequestDetailsStatusChecksComponentFactory.kt
View File

@@ -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 ->