From 145913a4689d0e95f41ddecff499582607cf4b36 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Lievremont Date: Tue, 26 Nov 2013 15:09:07 +0100 Subject: [PATCH] SONAR-4859 Fix regression on copy of rule template (no i18n there) --- .../main/java/org/sonar/server/rule/RuleRegistry.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/sonar-server/src/main/java/org/sonar/server/rule/RuleRegistry.java b/sonar-server/src/main/java/org/sonar/server/rule/RuleRegistry.java index 66e6b3b6db4..fc9a5c7f748 100644 --- a/sonar-server/src/main/java/org/sonar/server/rule/RuleRegistry.java +++ b/sonar-server/src/main/java/org/sonar/server/rule/RuleRegistry.java @@ -23,6 +23,7 @@ package org.sonar.server.rule; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Lists; import com.google.common.collect.Multimap; +import org.apache.commons.lang.StringUtils; import org.elasticsearch.ElasticSearchException; import org.elasticsearch.common.collect.Maps; import org.elasticsearch.common.io.BytesStream; @@ -169,8 +170,14 @@ public class RuleRegistry { .field("id", rule.getId()) .field("key", rule.getRuleKey()) .field("language", rule.getLanguage()) - .field("name", ruleI18nManager.getName(rule.getRepositoryKey(), rule.getRuleKey(), locale)) - .field("description", ruleI18nManager.getDescription(rule.getRepositoryKey(), rule.getRuleKey(), locale)) + .field("name", + StringUtils.defaultIfEmpty( + ruleI18nManager.getName(rule.getRepositoryKey(), rule.getRuleKey(), locale), + rule.getName())) + .field("description", + StringUtils.defaultString( + ruleI18nManager.getDescription(rule.getRepositoryKey(), rule.getRuleKey(), locale), + rule.getDescription())) .field("parentKey", rule.getParentId() == null ? null : rule.getParentId()) .field("repositoryKey", rule.getRepositoryKey()) .field("severity", rule.getPriority()) -- 2.39.5