java/code/src/com/redhat/rhn/common/localization/LocalizationService.java | 28
+++++++++-
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 14 +++++
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 2
3 files changed, 42 insertions(+), 2 deletions(-)
New commits:
commit e8190f9bb3002a5171f7d966032b072ece740aca
Author: Lukas Zapletal <lzap+git(a)redhat.com>
Date: Thu Sep 23 14:14:11 2010 +0200
629971 - added two county codes, better Localizer error message
diff --git a/java/code/src/com/redhat/rhn/common/localization/LocalizationService.java
b/java/code/src/com/redhat/rhn/common/localization/LocalizationService.java
index 74449ab..58c9969 100644
--- a/java/code/src/com/redhat/rhn/common/localization/LocalizationService.java
+++ b/java/code/src/com/redhat/rhn/common/localization/LocalizationService.java
@@ -335,12 +335,38 @@ public class LocalizationService {
return mess;
}
+ // returns the first class/method that does not belong to this
+ // package (who calls this actually) - for debugging purposes
+ private StackTraceElement getCallingMethod() {
+ try {
+ throw new RuntimeException("Stacktrace Dummy Exception");
+ } catch (RuntimeException e) {
+ try {
+ final String prefix = this.getClass().getPackage().getName();
+ for (StackTraceElement element : e.getStackTrace() ){
+ if (! element.getClassName().startsWith(prefix)) {
+ return element;
+ }
+ }
+ } catch (Throwable t) {
+ // dont break - return nothing rather than stop
+ return null;
+ }
+ }
+ return null;
+ }
+
private String getMissingMessageString(String messageId) {
+ String caller = "";
+ StackTraceElement callerElement = getCallingMethod();
+ if (callerElement != null) {
+ caller = " called by " + callerElement;
+ }
if (messageId == null) {
messageId = "null";
}
String message = "*** ERROR: Message with id: [" + messageId +
- "] not found.***";
+ "] not found.***" + caller;
log.error(message);
boolean exceptionMode = Config.get().getBoolean(
"web.l10n_missingmessage_exceptions");
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
index 397b958..ed46f4d 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
@@ -4250,6 +4250,13 @@ user before attempting to deactivate their account.</source>
</context-group>
</trans-unit>
+ <trans-unit id="BL">
+ <source>Saint Barthelemy</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">All country select list
pull-downs</context>
+ </context-group>
+ </trans-unit>
+
<trans-unit id="BM">
<source>Bermuda</source>
<context-group name="ctx">
@@ -5052,6 +5059,13 @@ user before attempting to deactivate their account.</source>
</context-group>
</trans-unit>
+ <trans-unit id="MF">
+ <source>Saint Martin</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">All country select list
pull-downs</context>
+ </context-group>
+ </trans-unit>
+
<trans-unit id="MG">
<source>Madagascar</source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
index 644ba75..f5663e2 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
@@ -18855,7 +18855,7 @@ performing a kickstart or creating a new kickstart
distribution.</strong>
</trans-unit>
<trans-unit id="sdc.details.migrate.notrustedorgs">
- <source>No trusted oranisations</source>
+ <source>No trusted organizations</source>
<context-group name="ctx">
<context
context-type="sourcefile">/systems/details/SystemMigrate.do</context>
</context-group>
Show replies by date