MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-02-04 23:39:07 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-305103 i18n: Some error messages for Task Server settings are not translated

Browse Source 
GitOrigin-RevId: 29024abd16ab664d089d67d7944a2304dc92e975
This commit is contained in:
Dmitry Avdeev
2023-02-10 14:40:40 +01:00
committed by intellij-monorepo-bot
parent 09833cc9d8
commit 5c8a4f6929
5 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
platform/tasks-platform-impl/resources/messages/TaskBundle.properties
View File

@@ -242,3 +242,4 @@ notification.content.do.not.show.again=Don't show again
notification.group.branch.context=Branch context switched
notification.group.tasks=Task server connection failed
notification.group.context.corrupted=Task context data corrupted
task.list.url.configuration.parameter.is.mandatory='Task list URL' configuration parameter is mandatory

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

@@ -418,3 +418,4 @@ pull.request.details.adjusting.labels=Adjusting labels\u2026
action.GithubCopyPathProvider.text=GitHub Repository URL
action.Github.Copy.Link.To.GitHub.text=Copy Link to GitHub Repository
request.response.0=Request response: {0}.

4
plugins/github/src/org/jetbrains/plugins/github/api/GithubApiRequestExecutor.kt
View File

@@ -19,6 +19,7 @@ import com.intellij.util.io.RequestBuilder
import org.jetbrains.annotations.TestOnly
import org.jetbrains.plugins.github.api.data.GithubErrorMessage
import org.jetbrains.plugins.github.exceptions.*
import org.jetbrains.plugins.github.i18n.GithubBundle
import org.jetbrains.plugins.github.util.GithubSettings
import java.io.IOException
import java.io.InputStream
@@ -156,7 +157,8 @@ sealed class GithubApiRequestExecutor {
if (jsonError?.containsReasonMessage("API rate limit exceeded") == true) {
GithubRateLimitExceededException(jsonError.presentableError)
}
else GithubAuthenticationException("Request response: ${jsonError?.presentableError ?: errorText ?: statusLine}.")
else GithubAuthenticationException(
GithubBundle.message("request.response.0", jsonError?.presentableError ?: errorText ?: statusLine))
}
else -> {

3
plugins/tasks/tasks-core/src/com/intellij/tasks/generic/GenericRepository.java
View File

@@ -5,6 +5,7 @@ import com.intellij.openapi.util.Comparing;
import com.intellij.openapi.util.io.StreamUtil;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.tasks.Task;
import com.intellij.tasks.TaskBundle;
import com.intellij.tasks.TaskRepositorySubtype;
import com.intellij.tasks.TaskRepositoryType;
import com.intellij.tasks.impl.BaseRepositoryImpl;
@@ -174,7 +175,7 @@ public class GenericRepository extends BaseRepositoryImpl {
@Override
public Task[] getIssues(@Nullable final String query, final int max, final long since) throws Exception {
if (StringUtil.isEmpty(myTasksListUrl)) {
throw new Exception("'Task list URL' configuration parameter is mandatory");
throw new Exception(TaskBundle.message("task.list.url.configuration.parameter.is.mandatory"));
}
if (!isLoginAnonymously() && !isUseHttpAuthentication()) {
executeMethod(getLoginMethod());

2
plugins/tasks/tasks-core/src/com/intellij/tasks/impl/httpclient/NewBaseRepositoryImpl.java
View File

@@ -133,7 +133,7 @@ public abstract class NewBaseRepositoryImpl extends BaseRepository {
public String getRestApiUrl(Object @NotNull ... parts) {
StringBuilder builder = new StringBuilder(getUrl());
builder.append(getRestApiPathPrefix());
if (builder.charAt(builder.length() - 1) == '/') {
if (!builder.isEmpty() && builder.charAt(builder.length() - 1) == '/') {
builder.deleteCharAt(builder.length() - 1);
}
for (Object part : parts) {