You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by vv...@apache.org on 2010/03/15 15:53:35 UTC
svn commit: r923274 - in /felix/trunk/webconsole/src/main:
java/org/apache/felix/webconsole/internal/compendium/
java/org/apache/felix/webconsole/internal/core/
java/org/apache/felix/webconsole/internal/deppack/
java/org/apache/felix/webconsole/interna...
Author: vvalchev
Date: Mon Mar 15 14:53:34 2010
New Revision: 923274
URL: http://svn.apache.org/viewvc?rev=923274&view=rev
Log:
Implemented FELIX-2203
/provide localization of plugin titles/
added English and Bulgarian locales
Modified:
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/ComponentsServlet.java
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/ConfigManager.java
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/LogServlet.java
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/BundlesServlet.java
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/ServicesServlet.java
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/deppack/DepPackServlet.java
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/misc/ConfigurationRender.java
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/misc/LicenseServlet.java
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/misc/ShellServlet.java
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/system/VMStatPlugin.java
felix/trunk/webconsole/src/main/native2ascii/OSGI-INF/l10n/bundle_bg.properties
felix/trunk/webconsole/src/main/resources/OSGI-INF/l10n/bundle.properties
Modified: felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/ComponentsServlet.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/ComponentsServlet.java?rev=923274&r1=923273&r2=923274&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/ComponentsServlet.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/ComponentsServlet.java Mon Mar 15 14:53:34 2010
@@ -61,7 +61,7 @@ public class ComponentsServlet extends S
private static final long serialVersionUID = 1L;
private static final String LABEL = "components";
- private static final String TITLE = "Components";
+ private static final String TITLE = "%scr.pluginTitle";
private static final String CSS[] = { "/res/ui/bundles.css" }; // yes, it's correct!
// actions
Modified: felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/ConfigManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/ConfigManager.java?rev=923274&r1=923273&r2=923274&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/ConfigManager.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/ConfigManager.java Mon Mar 15 14:53:34 2010
@@ -66,7 +66,7 @@ import org.osgi.service.metatype.ObjectC
public class ConfigManager extends ConfigManagerBase
{
private static final String LABEL = "configMgr"; // was name
- private static final String TITLE = "Configuration";
+ private static final String TITLE = "%config.pluginTitle";
private static final String CSS[] = { "/res/ui/config.css" };
private static final String PID_FILTER = "pidFilter";
Modified: felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/LogServlet.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/LogServlet.java?rev=923274&r1=923273&r2=923274&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/LogServlet.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/LogServlet.java Mon Mar 15 14:53:34 2010
@@ -42,7 +42,7 @@ import org.osgi.service.log.LogService;
public class LogServlet extends SimpleWebConsolePlugin implements OsgiManagerPlugin
{
private static final String LABEL = "logs";
- private static final String TITLE = "Log Service";
+ private static final String TITLE = "%log.pluginTitle";
private static final String CSS[] = { "/res/ui/logs.css" };
private final static int MAX_LOGS = 200; //maximum number of log entries
Modified: felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/BundlesServlet.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/BundlesServlet.java?rev=923274&r1=923273&r2=923274&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/BundlesServlet.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/BundlesServlet.java Mon Mar 15 14:53:34 2010
@@ -85,7 +85,7 @@ public class BundlesServlet extends Simp
/** the label of the bundles plugin - used by other plugins to reference to plugin details */
public static final String NAME = "bundles";
- private static final String TITLE = "Bundles";
+ private static final String TITLE = "%bundles.pluginTitle";
private static final String CSS[] = { "/res/ui/bundles.css" };
private static final String FIELD_STARTLEVEL = "bundlestartlevel";
Modified: felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/ServicesServlet.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/ServicesServlet.java?rev=923274&r1=923273&r2=923274&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/ServicesServlet.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/ServicesServlet.java Mon Mar 15 14:53:34 2010
@@ -113,7 +113,7 @@ public class ServicesServlet extends Sim
/** the label for the services plugin */
public static final String LABEL = "services";
- private static final String TITLE = "Services";
+ private static final String TITLE = "%services.pluginTitle";
private static final String CSS[] = null;
private final String TEMPLATE;
Modified: felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/deppack/DepPackServlet.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/deppack/DepPackServlet.java?rev=923274&r1=923273&r2=923274&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/deppack/DepPackServlet.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/deppack/DepPackServlet.java Mon Mar 15 14:53:34 2010
@@ -47,7 +47,7 @@ public class DepPackServlet extends Simp
{
private static final String LABEL = "deppack";
- private static final String TITLE = "Deployment Packages";
+ private static final String TITLE = "%deployment.pluginTitle";
private static final String CSS[] = { "/res/ui/deployment.css" };
//
Modified: felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/misc/ConfigurationRender.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/misc/ConfigurationRender.java?rev=923274&r1=923273&r2=923274&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/misc/ConfigurationRender.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/misc/ConfigurationRender.java Mon Mar 15 14:53:34 2010
@@ -45,7 +45,7 @@ public class ConfigurationRender extends
{
private static final String LABEL = "config";
- private static final String TITLE = "Configuration Status";
+ private static final String TITLE = "%configStatus.pluginTitle";
private static final String[] CSS_REFS = null;
/**
Modified: felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/misc/LicenseServlet.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/misc/LicenseServlet.java?rev=923274&r1=923273&r2=923274&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/misc/LicenseServlet.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/misc/LicenseServlet.java Mon Mar 15 14:53:34 2010
@@ -55,7 +55,7 @@ public final class LicenseServlet extend
static final String LICENSE_FILES[] = { "README", "DISCLAIMER", "LICENSE", "NOTICE" };
static final String LABEL = "licenses";
- static final String TITLE = "Licenses";
+ static final String TITLE = "%license.pluginTitle";
static final String CSS[] = { "/res/ui/license.css" };
// templates
Modified: felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/misc/ShellServlet.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/misc/ShellServlet.java?rev=923274&r1=923273&r2=923274&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/misc/ShellServlet.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/misc/ShellServlet.java Mon Mar 15 14:53:34 2010
@@ -43,7 +43,7 @@ public class ShellServlet extends Simple
{
private static final String LABEL = "shell";
- private static final String TITLE = "Shell";
+ private static final String TITLE = "%shell.pluginTitle";
private static final String[] CSS = { "/res/ui/shell.css" };
// templates
Modified: felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/system/VMStatPlugin.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/system/VMStatPlugin.java?rev=923274&r1=923273&r2=923274&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/system/VMStatPlugin.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/system/VMStatPlugin.java Mon Mar 15 14:53:34 2010
@@ -45,7 +45,7 @@ public class VMStatPlugin extends Simple
{
private static final String LABEL = "vmstat";
- private static final String TITLE = "System Information";
+ private static final String TITLE = "%vmstat.pluginTitle";
private static final String CSS[] = null;
private static final String ATTR_TERMINATED = "terminated";
Modified: felix/trunk/webconsole/src/main/native2ascii/OSGI-INF/l10n/bundle_bg.properties
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/native2ascii/OSGI-INF/l10n/bundle_bg.properties?rev=923274&r1=923273&r2=923274&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/native2ascii/OSGI-INF/l10n/bundle_bg.properties [UTF-8] (original)
+++ felix/trunk/webconsole/src/main/native2ascii/OSGI-INF/l10n/bundle_bg.properties [UTF-8] Mon Mar 15 14:53:34 2010
@@ -22,14 +22,17 @@
# native2ascii Maven Plugin from http://mojo.codehaus.org/native2ascii-maven-plugin/
# to translate the natively encoded files to ISO-8859-1 during bundle build
#
-
+# Translations requiring non-ISO-8859-1 encoding are placed in the
+# src/main/native2ascii/OSGI-INF/l10n folder and are converted using said
+# plugin while building the bundle
# native2ascii -encoding utf-8 bundle_bg.raw_properties bundle_bg.properties
+
# Common UI
reload=Презареждане
change=Промяна
-abort=Отказа
-back=Наза
+abort=Отказ
+back=Назад
id=Id
type=Тип
type_s=Тип(ове)
@@ -44,6 +47,7 @@ delete=Изтриване
refresh=Обновяване
# VMStat plugin
+vmstat.pluginTitle=Системна информация
vmstat.stopped=Системата е спряна
vmstat.restarting=Системата се рестартир. Моля изчакайте...
vmstat.reloading.in=Презареждане след ...
@@ -65,12 +69,14 @@ vmstat.gc.title=Изчистване н� vmstat.gc.button=Изчистване
# Services plugin
+services.pluginTitle=Услуги
services.details.hide=Скриване на детайлите
services.details.tip=Детайли
services.statusline=Информация за услугите: {0} услуги.
services.caption=Услуги
# Log plugin
+log.pluginTitle=Журнал
log.status.ok=Log Service е активен.
log.status.missing=Няма активен Log Service.
log.severity.label=Макс. ниво:
@@ -85,6 +91,7 @@ log.level.info=ИНФО
log.level.debug=ДЕТАЙЛИ
# Deployment Admin plugin
+deployment.pluginTitle=Управление на пакети
deployment.status.no_data=Няма инсталирани пакети!
deployment.status.no_service=Услугата Deployment Admin не е налична в момента!
deployment.status.ok=Deployment Admin е наличен и по-долу е показан списъка с пакет
@@ -96,10 +103,12 @@ deployment.bundles=Бъндъли
deployment.uninstall=Премахване
# Shell plugin
+shell.pluginTitle=Конзола
shell.clear=Изчистване
shell.status=Използвайте командният ред за изпълнение на команди.
# Bundles plugin
+bundles.pluginTitle=Бъндъли
bundles.statline=Информация за бъндълите: {0} бъндъли общо, {1} активни, {2} активни фрагменти, {3} resolved, {4} инсталирани.
bundles.install_or_update=Инсталиране/обновяване
bundles.install_update=Инсталиране/обновяване...
@@ -134,6 +143,7 @@ bundles.upload.level=Стартиращ�
# Components plugin
+scr.pluginTitle=Компоненти
scr.status.no_service=Нуждаете се от Apache Felix Declarative Service за да се възползвате от тази функционалност!
scr.status.no_components=Няма инсталирани компонент в момента!
scr.status.ok=Брой инсталирани компоненти: {0}
@@ -152,6 +162,7 @@ scr.title.name=Име
# Configuration plugin
+config.pluginTitle=Конфигурации
config.status.ok=Configuration Admin Service е достъпен.
config.status.missing=Няма Configuration Admin Service
config.properties=Настройки
@@ -167,15 +178,20 @@ config.del.ask=Сигурни ли ст� config.del.config=Конфигурация:
config.del.bundle=Бъндъл:
config.unbind.ask=Are you sure to unbind this configuration ?
-
+config.factories.title=Factory Конфигурации
+config.configurations.title=Конфигурации
+config.create.tip=Създаване на нова factory конфигурация
+config.edit.tip=Редактиране на стойностите на конфигурацията
# License plugin
+license.pluginTitle=Лицензи
license.status.ok=Следните бъндъли съдържат лицензионна информация.
license.status.none=Няма бъндъли съдържащо лицензионна информация
license.resources=Ресурси на бъндъла:
license.resources.embedded=Вградени ресурси от {0}:
# OBR Plugin
+obr.pluginTitle=OSGi Хранилище
obr.status.ok=Apache Bundle Repository услъгата е достъпна.
obr.status.no=Нуждаете се от Apache Bundle Repository услугата за да се възползвате от тази функционалност!
obr.version.select=Изберете версия...
@@ -192,3 +208,5 @@ obr.res.title=Достъпни ресу� obr.res.name=Име на ресурса
obr.res.installedVer=Инсталирана версия
+# Configuration Status plugin
+configStatus.pluginTitle=Конфиг. статус
Modified: felix/trunk/webconsole/src/main/resources/OSGI-INF/l10n/bundle.properties
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/resources/OSGI-INF/l10n/bundle.properties?rev=923274&r1=923273&r2=923274&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/resources/OSGI-INF/l10n/bundle.properties (original)
+++ felix/trunk/webconsole/src/main/resources/OSGI-INF/l10n/bundle.properties Mon Mar 15 14:53:34 2010
@@ -47,6 +47,7 @@ delete=Delete
refresh=Refresh
# VMStat plugin
+vmstat.pluginTitle=System Information
vmstat.stopped=Framework has been stopped.
vmstat.restarting=Framework is restarting. stand by ...
vmstat.reloading.in=Reloading in
@@ -68,12 +69,14 @@ vmstat.gc.title=Garbage Collection
vmstat.gc.button=Run
# Services plugin
+services.pluginTitle=Services
services.details.hide=Hide Details
services.details.tip=Details
services.statusline=Services information: {0} service(s) in total.
services.caption=Services
# Log plugin
+log.pluginTitle=Log Service
log.status.ok=Log Service is running.
log.status.missing=Log Service is not installed/running.
log.severity.label=Severity at least:
@@ -88,6 +91,7 @@ log.level.info=INFO
log.level.debug=DEBUG
# Deployment Admin plugin
+deployment.pluginTitle=Deployment Packages
deployment.status.no_data=No deployment packages installed!
deployment.status.no_service=Deployment Admin is not installed/running!
deployment.status.ok=Deployment Admin service is running
@@ -99,10 +103,12 @@ deployment.bundles=Bundles
deployment.uninstall=Uninstall
# Shell plugin
+shell.pluginTitle=Shell
shell.clear=Clear
shell.status=Use the command prompt to execute shell commands.
# Bundles plugin
+bundles.pluginTitle=Bundles
bundles.statline=Bundle information: {0} bundles in total, {1} bundles active, {2} active fragments, {3} bundles resolved, {4} bundles installed.
bundles.install_or_update=Install or Update
bundles.install_update=Install/Update...
@@ -137,6 +143,7 @@ bundles.upload.level=Start Level
# Components plugin
+scr.pluginTitle=Components
scr.status.no_service=Apache Felix Declarative Service required for this function!
scr.status.no_components=No components installed currently!
scr.status.ok=Number of installed components: {0}
@@ -155,6 +162,7 @@ scr.title.name=Name
# Configuration plugin
+config.pluginTitle=Configuration
config.status.ok=Configuration Admin Service is running.
config.status.missing=Configuration Admin Service is not installed/running.
config.properties=Properties
@@ -176,12 +184,14 @@ config.create.tip=Create new factory con
config.edit.tip=Edit the configuration values
# License plugin
+license.pluginTitle=Licenses
license.status.ok=The following bundles contains license files.
license.status.none=No bundles with license files available
license.resources=Bundle Resources:
license.resources.embedded=Embedded {0}:
# OBR Plugin
+obr.pluginTitle=OSGi Repository
obr.status.ok=The Apache Bundle Repository service is up and running.
obr.status.no=The Apache Bundle Repository service is not available!
obr.version.select=Select Version...
@@ -197,3 +207,6 @@ obr.repo.actions=Actions
obr.res.title=Available Resources
obr.res.name=Resource Name
obr.res.installedVer=Installed Version
+
+# Configuration Status plugin
+configStatus.pluginTitle=Configuration Status