backend/spacewalk-backend.spec rel-eng/packages
by Shannon Hughes
backend/spacewalk-backend.spec | 7 ++++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 6874481a231774f94c5d6987eca40e7778308a52
Author: Shannon Hughes <shughes(a)redhat.com>
Date: Thu Sep 23 15:07:36 2010 -0400
Automatic commit of package [spacewalk-backend] release [1.2.17-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 94a5b79..dc93980 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -10,7 +10,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2 and Python
-Version: 1.2.16
+Version: 1.2.17
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -687,6 +687,11 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Thu Sep 23 2010 Shannon Hughes <shughes(a)redhat.com> 1.2.17-1
+- modify reposync logrotate to include channel label log files
+ (shughes(a)redhat.com)
+- fixed spec after file rename (michael.mraka(a)redhat.com)
+
* Thu Sep 23 2010 Michael Mraka <michael.mraka(a)redhat.com> 1.2.16-1
- 634559 - fixed component name
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index aed0739..e403567 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.2.16-1 backend/
+1.2.17-1 backend/
13 years, 6 months
backend/logrotate
by Shannon Hughes
backend/logrotate/spacewalk-backend-tools | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit d4466672b4fbdcd085c2bd84b6caec5837bd6a3d
Author: Shannon Hughes <shughes(a)redhat.com>
Date: Thu Sep 23 14:54:29 2010 -0400
modify reposync logrotate to include channel label log files
diff --git a/backend/logrotate/spacewalk-backend-tools b/backend/logrotate/spacewalk-backend-tools
index 88e766a..305609c 100644
--- a/backend/logrotate/spacewalk-backend-tools
+++ b/backend/logrotate/spacewalk-backend-tools
@@ -12,7 +12,7 @@
size=10M
}
-/var/log/rhn/reposync/reposync.log {
+/var/log/rhn/reposync/*.log {
weekly
rotate 5
copytruncate
13 years, 6 months
backend/spacewalk-backend.spec
by Michael Mraka
backend/spacewalk-backend.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 2814ea5ceb76326d3237c20d711d9dc1e5fb0c71
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Sep 23 16:46:29 2010 +0200
fixed spec after file rename
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 5fdef21..94a5b79 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -539,7 +539,7 @@ rm -f %{rhnconf}/rhnSecret.py*
%{rhnroot}/satellite_exporter/handlers/__init__.py*
%{rhnroot}/satellite_exporter/handlers/non_auth_dumper.py*
# config files
-%attr(644,root,apache) %config %{httpdconf}/rhn/spacewalk-backend-sat-export-internal.conf
+%attr(644,root,apache) %config %{httpdconf}/rhn/spacewalk-backend-sat-dump-internal.conf
%config(noreplace) %{_sysconfdir}/logrotate.d/spacewalk-backend-iss-export
%attr(644,root,apache) %{rhnconf}/default/rhn_server_satexport_internal.conf
13 years, 6 months
java/code
by Lukas Zapletal
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>
13 years, 6 months
Changes to 'refs/tags/spacewalk-backend-1.2.16-1'
by Michael Mraka
Tag 'spacewalk-backend-1.2.16-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2010-09-23 12:10 +0000
Tagging package [spacewalk-backend] version [1.2.16-1] in directory [backend/].
Changes since spacewalk-java-1.2.44-1:
Michael Mraka (3):
renamed conf file to match handler it serves
634559 - fixed component name
Automatic commit of package [spacewalk-backend] release [1.2.16-1].
---
backend/httpd-conf/rhn/spacewalk-backend-sat-dump-internal.conf | 18 +++++++++
backend/httpd-conf/rhn/spacewalk-backend-sat-export-internal.conf | 20 ----------
backend/spacewalk-backend.spec | 5 ++
rel-eng/packages/spacewalk-backend | 2 -
4 files changed, 23 insertions(+), 22 deletions(-)
---
13 years, 6 months
backend/spacewalk-backend.spec rel-eng/packages
by Michael Mraka
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit b284c5396d62d690a9457e9d7fe2ca521119a0db
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Sep 23 14:10:34 2010 +0200
Automatic commit of package [spacewalk-backend] release [1.2.16-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 418a3db..5fdef21 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -10,7 +10,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2 and Python
-Version: 1.2.15
+Version: 1.2.16
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -687,6 +687,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Thu Sep 23 2010 Michael Mraka <michael.mraka(a)redhat.com> 1.2.16-1
+- 634559 - fixed component name
+
* Thu Sep 23 2010 Michael Mraka <michael.mraka(a)redhat.com> 1.2.15-1
- 634280 - errata should remain associated with already synced channels
- 634263 - allow guests to register across orgs
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index f70f5e3..aed0739 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.2.15-1 backend/
+1.2.16-1 backend/
13 years, 6 months
2 commits - backend/httpd-conf
by Michael Mraka
backend/httpd-conf/rhn/spacewalk-backend-sat-dump-internal.conf | 18 +++++++++
backend/httpd-conf/rhn/spacewalk-backend-sat-export-internal.conf | 20 ----------
2 files changed, 18 insertions(+), 20 deletions(-)
New commits:
commit 00dd0499014d71f4b070ba9b01fa0c8dac3352a6
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Sep 23 14:08:42 2010 +0200
634559 - fixed component name
diff --git a/backend/httpd-conf/rhn/spacewalk-backend-sat-dump-internal.conf b/backend/httpd-conf/rhn/spacewalk-backend-sat-dump-internal.conf
index 66bc21d..2a8ee02 100644
--- a/backend/httpd-conf/rhn/spacewalk-backend-sat-dump-internal.conf
+++ b/backend/httpd-conf/rhn/spacewalk-backend-sat-dump-internal.conf
@@ -11,7 +11,7 @@
PythonHandler satellite_exporter.satexport::Handler
PythonCleanupHandler satellite_exporter.satexport::CleanupHandler
PythonOption SERVER non_auth_dumper
- PythonOption RHNComponentType server.iss.internal
+ PythonOption RHNComponentType server.iss
DefaultType text/xml
</Location>
commit a3b1698e80ce526c198caee35c2550704fbee861
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Sep 22 10:51:09 2010 +0200
renamed conf file to match handler it serves
diff --git a/backend/httpd-conf/rhn/spacewalk-backend-sat-dump-internal.conf b/backend/httpd-conf/rhn/spacewalk-backend-sat-dump-internal.conf
new file mode 100644
index 0000000..66bc21d
--- /dev/null
+++ b/backend/httpd-conf/rhn/spacewalk-backend-sat-dump-internal.conf
@@ -0,0 +1,18 @@
+# ** DO NOT EDIT **
+# Configuration for the /SAT-DUMP-INTERNAL handler
+#
+#
+
+<IfModule mod_python.c>
+
+<Location /SAT-DUMP-INTERNAL>
+ SetHandler python-program
+ PythonHeaderParserHandler satellite_exporter.satexport::HeaderParserHandler
+ PythonHandler satellite_exporter.satexport::Handler
+ PythonCleanupHandler satellite_exporter.satexport::CleanupHandler
+ PythonOption SERVER non_auth_dumper
+ PythonOption RHNComponentType server.iss.internal
+ DefaultType text/xml
+</Location>
+
+</IfModule>
diff --git a/backend/httpd-conf/rhn/spacewalk-backend-sat-export-internal.conf b/backend/httpd-conf/rhn/spacewalk-backend-sat-export-internal.conf
deleted file mode 100644
index 7c05395..0000000
--- a/backend/httpd-conf/rhn/spacewalk-backend-sat-export-internal.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-# ** DO NOT EDIT **
-# Configuration for the /SAT-DUMP-INTERNAL handler
-#
-#
-
-<IfModule mod_python.c>
-
-<Location /SAT-DUMP-INTERNAL>
- SetHandler python-program
- PythonHeaderParserHandler satellite_exporter.satexport::HeaderParserHandler
- PythonHandler satellite_exporter.satexport::Handler
- PythonCleanupHandler satellite_exporter.satexport::CleanupHandler
- PythonOption SERVER non_auth_dumper
- PythonOption RHNComponentType server.iss.internal
- DefaultType text/xml
-</Location>
-
-</IfModule>
-
-
13 years, 6 months
Changes to 'refs/tags/spacewalk-java-1.2.44-1'
by Michael Mraka
Tag 'spacewalk-java-1.2.44-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2010-09-23 11:21 +0000
Tagging package [spacewalk-java] version [1.2.44-1] in directory [java/].
Changes since oracle-xe-selinux-10.2.0.19-1:
Lukas Zapletal (1):
resource spelling script and several typo corrections
Michael Mraka (3):
rhnServer is redundant here
indented to match sql convention
Automatic commit of package [spacewalk-java] release [1.2.44-1].
---
java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml | 15
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 20
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 36 -
java/spacewalk-java.spec | 6
rel-eng/packages/spacewalk-java | 2
scripts/spelling/check.sh | 26
scripts/spelling/check_all.sh | 23
scripts/spelling/check_en_US.sh | 7
scripts/spelling/ignored_en_US.txt | 265 ++++++++++
scripts/spelling/onlySource.xslt | 16
scripts/spelling/onlyTarget.xslt | 16
11 files changed, 394 insertions(+), 38 deletions(-)
---
13 years, 6 months
3 commits - java/code java/spacewalk-java.spec rel-eng/packages
by Michael Mraka
java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml | 15 +++++-----
java/spacewalk-java.spec | 6 +++-
rel-eng/packages/spacewalk-java | 2 -
3 files changed, 14 insertions(+), 9 deletions(-)
New commits:
commit 69d1d11272a11a7e1318339858c847aaa2cfda75
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Sep 23 13:21:04 2010 +0200
Automatic commit of package [spacewalk-java] release [1.2.44-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index ca770e4..a349d3f 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -19,7 +19,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.2.43
+Version: 1.2.44
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -336,6 +336,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu Sep 23 2010 Michael Mraka <michael.mraka(a)redhat.com> 1.2.44-1
+- fixed erratamailer_fill_work_queue
+- resource spelling script and several typo corrections
+
* Thu Sep 23 2010 Lukas Zapletal 1.2.43-1
- 636740 - asterisks in package search fixed
- 636120 - fixed an ISE in the org.listSystemEntitlements call to deal with null
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 64b484a..aca21da 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.2.43-1 java/
+1.2.44-1 java/
commit 3a72457a8e5f5e7262b0376ed8682a122621c418
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Sep 22 22:32:41 2010 +0200
indented to match sql convention
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml
index 4cd18a5..e62234c 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml
@@ -374,13 +374,14 @@ ORDER BY next_action DESC
INSERT INTO rhnPaidErrataTempCache
(user_id, server_id, errata_id)
SELECT urn.user_id, snv.server_id, snv.errata_id
- FROM rhnServerNeededCache snv inner join
- rhnUserReceiveNotifications urn ON snv.server_id = urn.server_id
- inner join
- rhnServerChannel sc on sc.server_id = snv.server_id
- WHERE sc.channel_id = :channel_id
- AND snv.errata_id = :errata_id
- AND S.org_id = :org_id
+ FROM rhnServerNeededCache snv
+ JOIN rhnUserReceiveNotifications urn
+ ON snv.server_id = urn.server_id
+ JOIN rhnServerChannel sc
+ ON sc.server_id = snv.server_id
+ WHERE sc.channel_id = :channel_id
+ AND snv.errata_id = :errata_id
+ AND S.org_id = :org_id
</query>
</write-mode>
commit 9f09cf8bb9854c9f8bc6f4e497a49abec3affee2
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Sep 22 22:30:32 2010 +0200
rhnServer is redundant here
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml
index 9f48fdd..4cd18a5 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml
@@ -376,8 +376,8 @@ ORDER BY next_action DESC
SELECT urn.user_id, snv.server_id, snv.errata_id
FROM rhnServerNeededCache snv inner join
rhnUserReceiveNotifications urn ON snv.server_id = urn.server_id
- inner join rhnServer S on S.id = snv.server_id inner join
- rhnServerChannel sc on sc.server_id = S.id
+ inner join
+ rhnServerChannel sc on sc.server_id = snv.server_id
WHERE sc.channel_id = :channel_id
AND snv.errata_id = :errata_id
AND S.org_id = :org_id
13 years, 6 months
java/code scripts/spelling
by Lukas Zapletal
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 20
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 36 -
scripts/spelling/check.sh | 26
scripts/spelling/check_all.sh | 23
scripts/spelling/check_en_US.sh | 7
scripts/spelling/ignored_en_US.txt | 265 ++++++++++
scripts/spelling/onlySource.xslt | 16
scripts/spelling/onlyTarget.xslt | 16
8 files changed, 380 insertions(+), 29 deletions(-)
New commits:
commit 752c64ae332a839e92ad0bb6fc09826e1574cac1
Author: Lukas Zapletal <lzap+git(a)redhat.com>
Date: Thu Sep 23 11:21:09 2010 +0200
resource spelling script and several typo corrections
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 2fd88cc..397b958 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
@@ -970,7 +970,7 @@ http://www.oasis-open.org/committees/xliff/documents/xliff-core-1.1.xsd"
</context-group>
</trans-unit>
<trans-unit id="testMessage.html">
- <source><p>You donot have enough entitlements for <strong> <a href="http://www.redhat.com">{0} systems</a></strong>.</p></source>
+ <source><p>You do not have enough entitlements for <strong> <a href="http://www.redhat.com">{0} systems</a></strong>.</p></source>
<context-group name="ctx">
<context context-type="sourcefile">Test Message - ignore</context>
</context-group>
@@ -1553,7 +1553,7 @@ http://www.oasis-open.org/committees/xliff/documents/xliff-core-1.1.xsd"
</context-group>
</trans-unit>
<trans-unit id="to_org">
-<source>Destination Organisation</source>
+<source>Destination Organization</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/systems/details/SystemMigrate</context>
</context-group>
@@ -6184,13 +6184,11 @@ user before attempting to deactivate their account.</source>
</trans-unit>
<trans-unit id="nocripterror">
- <source>Please enable Javascript or use a Javascript enabled browsr before proceeding with this action.</source>
+ <source>Please enable Javascript or use a Javascript enabled browser before proceeding with this action.</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/monitoring/config/PreservationList.do</context>
</context-group>
</trans-unit>
-
-
<trans-unit id="root_confirm_passwds.mismatch">
<source>The two passwords are not the same.</source>
@@ -7872,21 +7870,21 @@ Follow this url to see the full list of inactive systems:
</trans-unit>
<trans-unit id="system.migrate.org_not_trusted">
-<source>Systems can only be migrated between trusted organisations.</source>
+<source>Systems can only be migrated between trusted organizations.</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/systems/details/SystemMigrate.do</context>
</context-group>
</trans-unit>
<trans-unit id="system.migrate.no_trusted_orgs">
-<source>This organisation has no trusts defined with other organisations, or no other organisations are defined.</source>
+<source>This organization has no trusts defined with other organizations, or no other organizations are defined.</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/systems/details/SystemMigrate.do</context>
</context-group>
</trans-unit>
<trans-unit id="system.migrate.no_org_specified">
-<source>An organisation must be specified</source>
+<source>An organization must be specified</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/systems/details/SystemMigrate.do</context>
</context-group>
@@ -7925,7 +7923,7 @@ Follow this url to see the full list of inactive systems:
</trans-unit>
<trans-unit id="system.runningkernel.unknown">
- <source>Unkown</source>
+ <source>Unknown</source>
</trans-unit>
<trans-unit id="api.invalidargs">
@@ -8292,7 +8290,7 @@ Follow this url to see the full list of inactive systems:
</trans-unit>
<trans-unit id="frontend.actions.channels.manager.add.success">
- <source>Succesfully added {1} package(s) and scheduled {0} errata to be cloned to channel {2}. The cloned Errata should appear in the channel and applicable to systems within a few minutes.</source>
+ <source>Successfully added {1} package(s) and scheduled {0} errata to be cloned to channel {2}. The cloned Errata should appear in the channel and applicable to systems within a few minutes.</source>
</trans-unit>
<trans-unit id="frontend.actions.channels.manager.add.clone">
@@ -8703,7 +8701,7 @@ Follow this url to see the full list of inactive systems:
<trans-unit id="kickstart.cobbler.distro.syncfail">
<source>
The following is a list of errors gathered while Spacewalk attempts to
-syncronize kickstart distributions from Spacewalk to Cobbler. These
+synchronize kickstart distributions from Spacewalk to Cobbler. These
errors must be corrected for the distributions to be available for
kickstarting systems:
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 48bbd6c..644ba75 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
@@ -563,7 +563,7 @@
</trans-unit>
<trans-unit id="badparam.jsp.summary">
-<source>We could not display the requested page because of a missing parameter. This error could have occured several ways:</source>
+<source>We could not display the requested page because of a missing parameter. This error could have occurred several ways:</source>
<context-group name="ctx">
<context context-type="sourcefile">Bad Parameter error page</context>
</context-group>
@@ -1182,7 +1182,7 @@
</trans-unit>
<trans-unit id="preferences.entitlements-widget.description">
- <source> Lists out the numbers of available entitlments per entitlement type.</source>
+ <source> Lists out the numbers of available entitlements per entitlement type.</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/users/UserPreferences</context>
</context-group>
@@ -8094,7 +8094,7 @@ organization management tools if you choose to remove this role from your login.
</trans-unit>
<trans-unit id="schedulesync.jsp.profilesync">
-<source>Profile Syncrhonization</source>
+<source>Profile Synchronization</source>
<context-group name="ctx">
<context context-type="sourcefile">NOTFILLEDOUT</context>
</context-group>
@@ -9443,7 +9443,7 @@ Please note that some manual configuration of these scripts may still be require
<source>Setup your @@PRODUCT_NAME@@ Cobbler settings below.</source>
</trans-unit>
<trans-unit id="cobbler.jsp.summary2">
- <source>Cobbler sync is used to repair or rebuild the contents /tftpboot or /var/www/cobbler when manual modification of cobbler has occured.</source>
+ <source>Cobbler sync is used to repair or rebuild the contents /tftpboot or /var/www/cobbler when manual modification of cobbler has occurred.</source>
</trans-unit>
<trans-unit id="cobbler.jsp.summary3">
<source>For more information refer to the 'cobbler' man page.</source>
@@ -9473,7 +9473,7 @@ Please note that some manual configuration of these scripts may still be require
<source>Sync Now</source>
</trans-unit>
<trans-unit id="repos.jsp.message.taskoconfig">
- <source>Taskomatic configuration seems to be malformed. Fix it and scheudule task again.</source>
+ <source>Taskomatic configuration seems to be malformed. Fix it and schedule task again.</source>
</trans-unit>
<trans-unit id="repos.jsp.message.taskoaccess">
<source>Taskomatic not accessible. Restart it and set up repo sync again.</source>
@@ -9788,7 +9788,7 @@ Please note that some manual configuration of these scripts may still be require
</trans-unit>
<trans-unit id="kickstartdetails.jsp.virt_disk_path.tip">
- <source><strong>Tip:</strong> You may specify a file path (/var/lib/xen/images/disk), a Volume Group (VolGroup00), or a partiion (/dev/sda5). You can also specify multiple virtual disks by comma separating the filepaths, volume group, or partition (/dev/sdb1,/devsdc1).</source>
+ <source><strong>Tip:</strong> You may specify a file path (/var/lib/xen/images/disk), a Volume Group (VolGroup00), or a partition (/dev/sda5). You can also specify multiple virtual disks by comma separating the filepaths, volume group, or partition (/dev/sdb1,/devsdc1).</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/kickstart</context>
</context-group>
@@ -9836,14 +9836,14 @@ Please note that some manual configuration of these scripts may still be require
</context-group>
</trans-unit>
<trans-unit id="kickstart.jsp.error.invalidvariable">
- <source>You have specified an invalid variable: '{0}'. Variables should be name value pairs, seperated by a '=' symbol, with each pair being seperated by a new line. For example: 'ip=192.168.0.1'</source>
+ <source>You have specified an invalid variable: '{0}'. Variables should be name value pairs, separated by a '=' symbol, with each pair being separated by a new line. For example: 'ip=192.168.0.1'</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/kickstart</context>
</context-group>
</trans-unit>
<trans-unit id="kickstart.jsp.error.invalidoption">
- <source>You have specified an invalid option '{0}'. Options should be name value pairs, seperated by a '=' symbol, with each pair being seperated by a space. For example: 'ip=192.168.0.1 netmask=255.255.255.0'</source>
+ <source>You have specified an invalid option '{0}'. Options should be name value pairs, separated by a '=' symbol, with each pair being separated by a space. For example: 'ip=192.168.0.1 netmask=255.255.255.0'</source>
<context-group name="ctx">
<context context-type="sourcefile">Kickstart Details</context>
</context-group>
@@ -11136,7 +11136,7 @@ Please note that some manual configuration of these scripts may still be require
</context-group>
</trans-unit>
<trans-unit id="softwareedit.jsp.tip">
- <source><strong>Tip:</strong> Changing the base channel will require you to reselect any child cannels that may be associated with this profile.</source>
+ <source><strong>Tip:</strong> Changing the base channel will require you to reselect any child channels that may be associated with this profile.</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/kickstart/KickstartSoftwareEdit</context>
</context-group>
@@ -13933,7 +13933,7 @@ but are not subscribed to _@@PRODUCT_NAME@@Config_.</context>
<source>The files shown below will be deployed to the systems shown below.
Choose a scheduled date, or "earliest possible", from the date-chooser below.
Click the confirm button to schedule the deployment,
-or press your browser's back button to make modifications to your file and system slections.
+or press your browser's back button to make modifications to your file and system selections.
Note that if a given system overrides a given file, or has it in that system's local configuration channel, the file will NOT be deployed.</source>
<context-group name="ctx">
@@ -14098,7 +14098,7 @@ Note that if a given system overrides a given file, or has it in that system's l
</trans-unit>
<trans-unit id="deploysystems.jsp.warning">
-<source><strong>Warning:</strong> Please note that if any of the files you are attempting to deploy from the {0} configuration channel are overridden or outranked by a file with the same name on a higher-ranked channel any particular system is subscribed to, then the overridding / highest-ranking version of the file will be deployed to that system, rather than the version from the {0} configuration channel.</source>
+<source><strong>Warning:</strong> Please note that if any of the files you are attempting to deploy from the {0} configuration channel are overridden or outranked by a file with the same name on a higher-ranked channel any particular system is subscribed to, then the overriding / highest-ranking version of the file will be deployed to that system, rather than the version from the {0} configuration channel.</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/</context>
<context context-type="paramnotes"></context>
@@ -14781,7 +14781,7 @@ You can't edit this file because it is a binary file.
</trans-unit>
<trans-unit id="filedetails.contents.jspf.binary-display">
<source>
-This is a binary file, and canot be displayed.
+This is a binary file, and can not be displayed.
</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/configuration/file/FileDetails.do</context>
@@ -20077,7 +20077,7 @@ Alternatively, you will want to download <strong>Incremental Channel Conte
</trans-unit>
<trans-unit id="physicalhosts.jsp.para2">
-<source>You may always delete the @@PRODUCT_NAME@@ system profie of a guest listed above to free the software and system entitlements it consumes (or you may remove system entitlements from the guest to free system entitlements). You may be able to free the physical entitlements associated with the guest without deleting the guest's profile:</source>
+<source>You may always delete the @@PRODUCT_NAME@@ system profile of a guest listed above to free the software and system entitlements it consumes (or you may remove system entitlements from the guest to free system entitlements). You may be able to free the physical entitlements associated with the guest without deleting the guest's profile:</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/systems/entitlements/PhysicalHosts.do</context>
</context-group>
@@ -21682,7 +21682,7 @@ given channel.</source>
<source>Create Custom Info Key</source>
</trans-unit>
<trans-unit id="system.jsp.customkey.createmsg">
- <source>Define infomation about this key below.</source>
+ <source>Define information about this key below.</source>
</trans-unit>
<trans-unit id="system.jsp.customkey.createbutton">
<source>Create Key</source>
@@ -21738,7 +21738,7 @@ given channel.</source>
</trans-unit>
<trans-unit id="baddownload.jsp.retry">
- <source>Please revisit the page you recieved this url from to recieve a new one.</source>
+ <source>Please revisit the page you received this url from to receive a new one.</source>
</trans-unit>
<trans-unit id="package.jsp.alt">
@@ -22404,10 +22404,10 @@ given channel.</source>
</trans-unit>
<trans-unit id="channel.jsp.errata.sync.message">
<source>The following errata were cloned from errata that have since been updated.
- This page will allow you to syncronize your cloned errata to that of its original.</source>
+ This page will allow you to synchronize your cloned errata to that of its original.</source>
</trans-unit>
<trans-unit id="channel.jsp.errata.sync.note">
- <source>Packages that were omitted as part of the origianl cloning process will be included here.</source>
+ <source>Packages that were omitted as part of the original cloning process will be included here.</source>
</trans-unit>
<trans-unit id="channel.jsp.errata.sync.listempty">
<source>No out of date errata were found.</source>
@@ -22419,7 +22419,7 @@ given channel.</source>
<source>The following packages will be pushed to this channel as part of the errata sync process. Please review this list and unselect any unwanted packages.</source>
</trans-unit>
<trans-unit id="channel.jsp.errata.sync.complete">
- <source>Sucessfully syncronized {0} errata and pushed {1} packages to channel {2}.</source>
+ <source>Successfully synchronized {0} errata and pushed {1} packages to channel {2}.</source>
</trans-unit>
<trans-unit id="channel.jsp.repodata">
<source>Repo Cache Status</source>
diff --git a/scripts/spelling/check.sh b/scripts/spelling/check.sh
new file mode 100644
index 0000000..fb504f2
--- /dev/null
+++ b/scripts/spelling/check.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+dirs=(
+java/code/src/com/redhat/rhn/frontend/strings/database
+java/code/src/com/redhat/rhn/frontend/strings/java
+java/code/src/com/redhat/rhn/frontend/strings/jsp
+java/code/src/com/redhat/rhn/frontend/strings/nav
+java/code/src/com/redhat/rhn/frontend/strings/template
+)
+
+for lang in "${langs[@]}"
+do
+ for dir in "${dirs[@]}"
+ do
+ if [ "$lang" = "en_US" ]; then
+ xslt=onlySource.xslt
+ else
+ xslt=onlyTarget.xslt
+ fi
+ dirbase=$(basename "$dir")
+ echo "Spell check result for $lang in $dirbase"
+ xsltproc $xslt ../../$dir/StringResource_$lang.xml | \
+ aspell list -l $lang -p $(pwd)/ignored_$lang.txt --ignore=3 --encoding=utf-8 | \
+ sort -u
+ done
+done
diff --git a/scripts/spelling/check_all.sh b/scripts/spelling/check_all.sh
new file mode 100755
index 0000000..7b099d7
--- /dev/null
+++ b/scripts/spelling/check_all.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+langs=(
+en_US
+bn_IN
+de
+en_US
+es
+fr
+gu
+hi
+it
+ja
+ko
+pa
+pt_BR
+ru
+ta
+zh_CN
+zh_TW
+)
+
+. ./check.sh
diff --git a/scripts/spelling/check_en_US.sh b/scripts/spelling/check_en_US.sh
new file mode 100755
index 0000000..49b60d7
--- /dev/null
+++ b/scripts/spelling/check_en_US.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+langs=(
+en_US
+)
+
+. ./check.sh
diff --git a/scripts/spelling/ignored_en_US.txt b/scripts/spelling/ignored_en_US.txt
new file mode 100644
index 0000000..f533952
--- /dev/null
+++ b/scripts/spelling/ignored_en_US.txt
@@ -0,0 +1,265 @@
+personal_ws-1.1 en 0 utf-8
+ActionDetails
+AclHandler
+aclXXXX
+Bouvet
+Burkina
+Caicos
+catalina
+checkbox
+Checkin
+cleanindex
+config
+Config
+CPUs
+Debian
+Faroe
+Faso
+filename
+Futuna
+guestname
+Hong
+hostname
+Hostname
+http
+httpd
+https
+IllegalAccessException
+IllegalInvocationException
+initrd
+iSeries
+Javascript
+kickstart
+Kickstart
+kickstarted
+kickstarting
+kickstarts
+kickstart's
+Kitts
+Lanka
+Leste
+login
+Login
+Logins
+LoginSubmit
+Lookup
+Macau
+Marino
+Mayen
+Mayotte
+mips
+Miquelon
+mtime
+Niue
+NVRE
+Palau
+Papua
+PowerPC
+pSeries
+Puerto
+redhat
+RHEL
+rhnsd
+sbin
+SearchServer
+SELinux
+solaris
+Solaris
+Sparc
+symlink
+symlinks
+taskomatic
+TASKOMATIC
+Timor
+Tokelau
+TRACEBACK
+Unentitle
+Unentitled
+Ungrouped
+Unhandled
+unsubscribe
+unsubscribed
+username
+Username
+vCPUs
+virsh
+virtualization
+Virtualization
+XMLRPC
+yyyy
+Zealand
+CompletedSystems
+FailedSystems
+GeneralConfig
+YourRhn
+Côte
+d'Ivoire
+Acknowledgement
+conf
+conns
+ExtendedStatus
+Filesystem
+FQDN
+ICMP
+IMAP
+Inodes
+iostat
+JDBC
+LongLegs
+Metres
+MySQL
+Pathname
+RCVD
+rdbms
+RHNMD
+RPMs
+Servlet
+SMTP
+SNMP
+Tablespace
+Uptime
+UserAgent
+Weblogic
+webserver
+ActivationKeysList
+adminstrators
+AllErrata
+apache
+auth
+Backend
+Backout
+bootloader
+Bootloader
+Bugfix
+Bugfixes
+cancelled
+checkboxes
+checkin
+Checksum
+chroot
+Comfirm
+commandline
+CommitErrataPackageChanges
+CompletedActions
+conf
+Configs
+Cpus
+CreateCorporate
+CreateProfileWizard
+critera
+Cron
+crypto
+cryptokey
+CryptoKeysList
+CVEs
+debuginfo
+DebugInfo
+deployable
+Deployable
+devsdc
+DHCP
+distro
+downloadable
+ELILO
+enablement
+Enablement
+esystem
+executables
+FailedActions
+FasTrack
+filepath
+filepaths
+filesystem
+GnuPG
+GPLv
+Greyed
+href
+html
+InProgressSystems
+ISOs
+kerberos
+Kerberos
+kickstartable
+Kickstartable
+KickstartPackagesEdit
+KickstartPartitionEdit
+KickstartSoftwareEdit
+Knowledgebase
+ksid
+LDAP
+listicon
+logout
+lookup
+myfilename
+nbsp
+Netboot
+newlogin
+nochroot
+nvrea
+patchset
+patchsets
+Patchsets
+plaintext
+Pluggable
+prepended
+PreservationList
+privledges
+privleges
+ProbeEdit
+ProbeList
+PurchaseHistory
+pxeboot
+Readme
+repo
+Repo
+repos
+Resubscription
+RHBA
+rhel
+rhncfg
+rpms
+RPMs
+searchable
+SElinux
+showgroups
+SNMP
+subscribable
+Subscribable
+SubscriptionManagement
+subtab
+SunOs
+SupportedISOs
+SystemChannels
+SystemEntitlements
+SystemList
+templating
+tftpboot
+Timestamp
+unchecking
+unentitled
+ungrouped
+uninstall
+unix
+Unschedule
+unselect
+Unselect
+unselectall
+updatelist
+uptime
+UserPreferences
+UUID
+VirtualGuestsList
+Virtualized
+vmlinuz
+VolGroup
+webcasts
+wget
+whitepapers
+wildcards
+xenbr
+Zipcode
+logins
+Entitler
+Isls
+prid
+selectall
diff --git a/scripts/spelling/onlySource.xslt b/scripts/spelling/onlySource.xslt
new file mode 100644
index 0000000..f1a9665
--- /dev/null
+++ b/scripts/spelling/onlySource.xslt
@@ -0,0 +1,16 @@
+<xsl:stylesheet version="1.0"
+ xmlns:x="urn:oasis:names:tc:xliff:document:1.1"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+ <xsl:output method="text"/>
+
+ <xsl:template match="@*|node()">
+ <xsl:apply-templates select="@*|node()"/>
+ </xsl:template>
+
+ <xsl:template match="x:source">
+ <xsl:value-of select="text()"/>
+ <xsl:text> </xsl:text>
+ </xsl:template>
+
+</xsl:stylesheet>
diff --git a/scripts/spelling/onlyTarget.xslt b/scripts/spelling/onlyTarget.xslt
new file mode 100644
index 0000000..2110eb0
--- /dev/null
+++ b/scripts/spelling/onlyTarget.xslt
@@ -0,0 +1,16 @@
+<xsl:stylesheet version="1.0"
+ xmlns:x="urn:oasis:names:tc:xliff:document:1.1"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+ <xsl:output method="text"/>
+
+ <xsl:template match="@*|node()">
+ <xsl:apply-templates select="@*|node()"/>
+ </xsl:template>
+
+ <xsl:template match="x:target">
+ <xsl:value-of select="text()"/>
+ <xsl:text> </xsl:text>
+ </xsl:template>
+
+</xsl:stylesheet>
13 years, 6 months