diff options
| author | Stas Vilchik <vilchiks@gmail.com> | 2015-03-09 15:43:05 +0100 |
|---|---|---|
| committer | Stas Vilchik <vilchiks@gmail.com> | 2015-03-09 15:43:05 +0100 |
| commit | 0de35e885e368d4f8698fb76b8138c6bf2008026 (patch) | |
| tree | 9ae9c42cf431b81e1c97bccfe012da098865c7fc /plugins/sonar-core-plugin/src | |
| parent | fb9f54a03332f1bdf5ffb08906e575f35a860a9c (diff) | |
| parent | b62e3e85e99579a4ef56e24331296122d28f68c7 (diff) | |
| download | sonarqube-0de35e885e368d4f8698fb76b8138c6bf2008026.tar.gz sonarqube-0de35e885e368d4f8698fb76b8138c6bf2008026.zip | |
Merge branch 'master' into branch-5.2
Conflicts:
server/sonar-server/src/main/java/org/sonar/server/platform/ServerComponents.java
server/sonar-web/src/main/less/components.less
Diffstat (limited to 'plugins/sonar-core-plugin/src')
| -rw-r--r-- | plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/size.html.erb | 4 |
1 files changed, 2 insertions, 2 deletions
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 @@ <tr> <td> <% if language_key.eql? '<null>' %> - <%= 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? '<null>' %> - <%= message('other') -%> + <%= message('unknown') -%> <% else %> <% language = languages.find { |l| l.getKey()==language_key.to_s } -%> <%= language ? language.getName() : language_key -%> |