From 35ecb682573667ce59f9cbeb8b7562f565fc09f7 Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Fri, 6 Mar 2015 09:47:38 +0100 Subject: SONAR-4624 complete "new FP issues" with resolution "won't fix" -> dispatcher becomes "Issues resolved as false positive or won't fix" --- sonar-core/src/main/resources/org/sonar/l10n/core.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sonar-core/src') diff --git a/sonar-core/src/main/resources/org/sonar/l10n/core.properties b/sonar-core/src/main/resources/org/sonar/l10n/core.properties index f7c7f68f0e3..3736c11e312 100644 --- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties +++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties @@ -2030,7 +2030,7 @@ notification.dispatcher.information=Subscribe to following channels to be notifi notification.dispatcher.ChangesOnMyIssue=Changes in issues assigned to me or reported by me notification.dispatcher.NewIssues=New issues notification.dispatcher.NewAlerts=New quality gate status -notification.dispatcher.NewFalsePositiveIssue=New false positives +notification.dispatcher.NewFalsePositiveIssue=Issues resolved as false positive or won't fix #------------------------------------------------------------------------------ -- cgit v1.2.3 From 8f27adb529037708f56e5127240e4e237d584fd9 Mon Sep 17 00:00:00 2001 From: Julien HENRY Date: Mon, 9 Mar 2015 10:58:23 +0100 Subject: SONAR-5077 Change label "Other" -> "Unknown" --- .../src/main/resources/org/sonar/plugins/core/widgets/size.html.erb | 4 ++-- sonar-core/src/main/resources/org/sonar/l10n/core.properties | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'sonar-core/src') diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/size.html.erb b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/size.html.erb index 9e0797f8005..7811e848f0d 100644 --- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/size.html.erb +++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/size.html.erb @@ -50,7 +50,7 @@ <% if language_key.eql? '' %> - <%= message('other') -%> + <%= message('unknown') -%> <% else %> <% language = languages.find { |l| l.getKey()==language_key.to_s } -%> <%= language ? language.getName() : language_key -%> @@ -80,7 +80,7 @@ <% language_key = ncloc_language_dist_hash.first[0] if language_key.eql? '' %> - <%= message('other') -%> + <%= message('unknown') -%> <% else %> <% language = languages.find { |l| l.getKey()==language_key.to_s } -%> <%= language ? language.getName() : language_key -%> diff --git a/sonar-core/src/main/resources/org/sonar/l10n/core.properties b/sonar-core/src/main/resources/org/sonar/l10n/core.properties index 3736c11e312..7e43654f746 100644 --- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties +++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties @@ -105,7 +105,6 @@ open_verb=Open operations=Operations optional=Optional order=Order -other=Other owner=Owner package=Package packages=Packages @@ -163,6 +162,7 @@ type=Type unfollow=Unfollow unit_test=Unit test unit_tests=Unit tests +unknown=Unknown unresolved=Unresolved unselect_all=Unselect all unselect_verb=Unselect -- cgit v1.2.3 From f4a5cf1d37914a21bf42580f9fdc76204702b760 Mon Sep 17 00:00:00 2001 From: Julien HENRY Date: Mon, 9 Mar 2015 11:03:10 +0100 Subject: SONAR-5077 Fix test --- sonar-core/src/test/java/org/sonar/core/i18n/DefaultI18nTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sonar-core/src') diff --git a/sonar-core/src/test/java/org/sonar/core/i18n/DefaultI18nTest.java b/sonar-core/src/test/java/org/sonar/core/i18n/DefaultI18nTest.java index b859c92bc86..d787b0e6983 100644 --- a/sonar-core/src/test/java/org/sonar/core/i18n/DefaultI18nTest.java +++ b/sonar-core/src/test/java/org/sonar/core/i18n/DefaultI18nTest.java @@ -72,7 +72,7 @@ public class DefaultI18nTest { // Only in english assertThat(manager.getPropertyKeys().contains("assignee")).isTrue(); assertThat(manager.getPropertyKeys().contains("sqale.page")).isTrue(); - assertThat(manager.getPropertyKeys().contains("unknown")).isFalse(); + assertThat(manager.getPropertyKeys().contains("bla_bla_bla")).isFalse(); } @Test @@ -124,8 +124,8 @@ public class DefaultI18nTest { @Test public void return_default_value_if_missing_key() { - assertThat(manager.message(Locale.ENGLISH, "unknown", "default")).isEqualTo("default"); - assertThat(manager.message(Locale.FRENCH, "unknown", "default")).isEqualTo("default"); + assertThat(manager.message(Locale.ENGLISH, "bla_bla_bla", "default")).isEqualTo("default"); + assertThat(manager.message(Locale.FRENCH, "bla_bla_bla", "default")).isEqualTo("default"); } @Test -- cgit v1.2.3 From ce3a382edc132d253dd6e5c4be9d2939c0839208 Mon Sep 17 00:00:00 2001 From: Stas Vilchik Date: Fri, 6 Mar 2015 10:04:27 +0100 Subject: Revert "update shortcuts help labels" This reverts commit 7112f00bad9ebb9081d08200ec41f210ed7cbe3b. --- sonar-core/src/main/resources/org/sonar/l10n/core.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sonar-core/src') diff --git a/sonar-core/src/main/resources/org/sonar/l10n/core.properties b/sonar-core/src/main/resources/org/sonar/l10n/core.properties index 7e43654f746..1c2fb9256d0 100644 --- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties +++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties @@ -1071,8 +1071,8 @@ shortcuts.section.issue.comment=comment issue shortcuts.section.issue.change_tags=change tags of issue shortcuts.section.rules=Rules Page -shortcuts.section.rules.navigate_between_rules=navigate between items in a list -shortcuts.section.rules.open_details=go from the list of items to the rule details +shortcuts.section.rules.navigate_between_rules=navigate between rules +shortcuts.section.rules.open_details=go from the list of rules to the rule details shortcuts.section.rules.return_to_list=return back to the list -- cgit v1.2.3 From 6c373169310c2ec447c1e9eb4dac3c9189844e11 Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Mon, 9 Mar 2015 14:36:30 +0100 Subject: Improve description of sonar.lf.logoWidthPx Use correct English! --- .../src/main/java/org/sonar/core/config/CorePropertyDefinitions.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sonar-core/src') diff --git a/sonar-core/src/main/java/org/sonar/core/config/CorePropertyDefinitions.java b/sonar-core/src/main/java/org/sonar/core/config/CorePropertyDefinitions.java index 97977cd2162..2d35e2c67e7 100644 --- a/sonar-core/src/main/java/org/sonar/core/config/CorePropertyDefinitions.java +++ b/sonar-core/src/main/java/org/sonar/core/config/CorePropertyDefinitions.java @@ -55,7 +55,7 @@ public class CorePropertyDefinitions { PropertyDefinition.builder("sonar.lf.logoWidthPx") .deprecatedKey("sonar.branding.image.width") .name("Width of image in pixels") - .description("Width in pixels, according that the height of image is constrained to 30px.") + .description("Width in pixels, given that the height of the the image is constrained to 30px") .category(CoreProperties.CATEGORY_GENERAL) .subCategory(CoreProperties.SUBCATEGORY_LOOKNFEEL) .build(), -- cgit v1.2.3