Author: gmazza
Date: Wed Jul 30 18:57:53 2014
New Revision: 1614740
URL: http://svn.apache.org/r1614740
Log:
Removed unused/unimplemented email from address for user new account
activation; switched to more readable constant for email address activation.
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Register.java
roller/trunk/app/src/main/resources/ApplicationResources.properties
roller/trunk/app/src/main/resources/ApplicationResources_de.properties
roller/trunk/app/src/main/resources/ApplicationResources_fr.properties
roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties
roller/trunk/app/src/main/resources/ApplicationResources_ko.properties
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/runtimeConfigDefs.xml
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Register.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Register.java?rev=1614740&r1=1614739&r2=1614740&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Register.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Register.java
Wed Jul 30 18:57:53 2014
@@ -203,7 +203,7 @@ public class Register extends UIAction i
// are we using email activation?
boolean activationEnabled =
WebloggerRuntimeConfig.getBooleanProperty(
- "user.account.activation.enabled");
+ "user.account.email.activation");
if (activationEnabled) {
// User account will be enabled after the activation
process
ud.setEnabled(Boolean.FALSE);
Modified: roller/trunk/app/src/main/resources/ApplicationResources.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources.properties?rev=1614740&r1=1614739&r2=1614740&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources.properties
(original)
+++ roller/trunk/app/src/main/resources/ApplicationResources.properties Wed Jul
30 18:57:53 2014
@@ -306,10 +306,9 @@ configForm.allowUserWeblogCreation=Allow
configForm.none=None specified
configForm.userSettings=User Settings
-configForm.accountActivation=Require new users to activate accounts via email
-configForm.accountActivationFromAddress=Email address for account activation
messages
+configForm.requireEmailActivation=Require new users to activate accounts via
email
configForm.allowNewUsers=Allow New Users?
-configForm.registrationUrl=External registration URL
+configForm.registrationUrl=Registration URL override (optional)
configForm.editorPages=Editor Pages
configForm.webServicesSettings=Web Services Settings
@@ -413,8 +412,8 @@ editor.xinha.name=Rich Text Editor (Xinh
email.comment.wrote=wrote
email.comment.anonymous=An anonymous user wrote
email.comment.respond=Respond to this comment at
-email.comment.management.link=Link to comment management page:
-email.comment.commenter.email=Commenter's email address:
+email.comment.management.link=Link to comment management page
+email.comment.commenter.email=Commenter's email address
email.comment.title=Comment
email.comment.moderate.title=Pending Blog Comment
email.comment.commentApproved=Comment Approved
Modified: roller/trunk/app/src/main/resources/ApplicationResources_de.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_de.properties?rev=1614740&r1=1614739&r2=1614740&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_de.properties
(original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_de.properties Wed
Jul 30 18:57:53 2014
@@ -248,8 +248,7 @@ commonPingTargets.explanation=Diese Ziel
commonPingTargets.subtitle=Management der allgemeinen Ping Ziele f\u00FCr alle
Weblogs.
# ---------------------------------------------------- Ping Target
Admin/Editing
configForm.absoluteUrl=Absolute URL zur Site (falls notwendig)
-configForm.accountActivation=Neue Benutzer m\u00FCssen Ihren Zugang per E-Mail
aktivieren
-configForm.accountActivationFromAddress=E-Mailadresse f\u00FCr die
Accountaktivierungsmeldungen
+configForm.requireEmailActivation=Neue Benutzer m\u00FCssen Ihren Zugang per
E-Mail aktivieren
configForm.allowNewUsers=Erlaube das Anlegen neuer Benutzer?
configForm.allowedExtensions=Zul\u00E4ssige Dateierweiterungen
configForm.commentHtmlAllowed=HTML in Kommentaren erlauben?
Modified: roller/trunk/app/src/main/resources/ApplicationResources_fr.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_fr.properties?rev=1614740&r1=1614739&r2=1614740&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_fr.properties
(original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_fr.properties Wed
Jul 30 18:57:53 2014
@@ -258,8 +258,7 @@ configForm.absoluteUrl=URL absolue du si
configForm.suspendPingProcessing=Suspendre les notifications
configForm.userSettings=Paramètres utilisateur
-configForm.accountActivation=Les nouveaux utilisateurs doivent activer leur
compte par courriel
-configForm.accountActivationFromAddress=Adresse de courriel du compte utilisé
pour les messages d'activation ('from')
+configForm.requireEmailActivation=Les nouveaux utilisateurs doivent activer
leur compte par courriel
configForm.allowNewUsers=Autoriser de nouveaux utilisateurs
configForm.registrationUrl=URL externe d'enregistrement
configForm.editorPages=Pages utilisées comme éditeur de texte.
Modified:
roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties?rev=1614740&r1=1614739&r2=1614740&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties
(original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties
Wed Jul 30 18:57:53 2014
@@ -994,7 +994,6 @@ pageForm.subtitle=\u30D6\u30ED\u30B0<spa
stylesheetEdit.subtitle=\u30AB\u30B9\u30BF\u30E0\u30B9\u30BF\u30A4\u30EB\u30B7\u30FC\u30C8\u3092\u7DE8\u96C6
CreateWeblog.error.emailAddressSize=\u30E1\u30FC\u30EB\u30A2\u30C9\u30EC\u30B9\u306F255\u6587\u5B57\u4EE5\u5185\u3067\u306A\u3051\u308C\u3070\u3044\u3051\u307E\u305B\u3093
Register.error.emailAddressSize=\u30E1\u30FC\u30EB\u30A2\u30C9\u30EC\u30B9\u306F255\u6587\u5B57\u4EE5\u5185\u3067\u306A\u3051\u308C\u3070\u3044\u3051\u307E\u305B\u3093
-configForm.accountActivationFromAddress=\u30A2\u30AB\u30A6\u30F3\u30C8\u8A8D\u8A3C\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u9001\u4FE1\u3059\u308B\u30E1\u30FC\u30EB\u30A2\u30C9\u30EC\u30B9
Register.error.emailAddressNull=\u30E1\u30FC\u30EB\u30A2\u30C9\u30EC\u30B9\u306F\u5FC5\u9808\u9805\u76EE\u3067\u3059
CreateWeblog.error.emailAddressNull=\u30E1\u30FC\u30EB\u30A2\u30C9\u30EC\u30B9\u306F\u5FC5\u9808\u9805\u76EE\u3067\u3059
configForm.commentPlugins=\u30B3\u30E1\u30F3\u30C8\u30D5\u30A9\u30FC\u30DE\u30C3\u30C8\u30D7\u30E9\u30B0\u30A4\u30F3\u306E\u8A31\u53EF/\u4E0D\u8A31\u53EF
@@ -1077,7 +1076,7 @@ commentManagement.readmore=\u3059\u3079\
commentServlet.commentAccepted=\u30B3\u30E1\u30F3\u30C8\u304C\u8A31\u53EF\u3055\u308C\u307E\u3057\u305F\u3002
commentServlet.previewCommentOnly=\u3053\u308C\u306F\u30D7\u30EC\u30D3\u30E5\u30FC\u3067\u3059
commentServlet.email.thereAreErrorMessages=\u6B21\u306E\u7406\u7531\u306B\u3088\u308A\u30B3\u30E1\u30F3\u30C8\u306E\u691C\u8A3C\u306B\u5931\u6557\u3057\u307E\u3057\u305F\uFF1A
-configForm.accountActivation=\u65B0\u898F\u30E6\u30FC\u30B6\u306F\u30E1\u30FC\u30EB\u8A8D\u8A3C\u304C\u5FC5\u8981\u3067\u3059
+configForm.requireEmailActivation=\u65B0\u898F\u30E6\u30FC\u30B6\u306F\u30E1\u30FC\u30EB\u8A8D\u8A3C\u304C\u5FC5\u8981\u3067\u3059
configForm.weblogSettings=\u30D6\u30ED\u30B0\u8868\u793A\u8A2D\u5B9A
CreateWeblog.error.emailAddressBad=\u30E1\u30FC\u30EB\u30A2\u30C9\u30EC\u30B9\u306E\u5F62\u5F0F\u304C\u6B63\u3057\u304F\u3042\u308A\u307E\u305B\u3093
CreateWeblog.error.timeZoneNull=\u30BF\u30A4\u30E0\u30BE\u30FC\u30F3\u306F\u5FC5\u9808\u3067\u3059
Modified: roller/trunk/app/src/main/resources/ApplicationResources_ko.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_ko.properties?rev=1614740&r1=1614739&r2=1614740&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_ko.properties
(original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_ko.properties Wed
Jul 30 18:57:53 2014
@@ -269,8 +269,7 @@ configForm.absoluteUrl=\uc0ac\uc774\ud2b
configForm.suspendPingProcessing=\ubaa8\ub4e0 \uc5f0\uacb0\ud655\uc778(ping)
\ucc98\ub9ac\ub97c \uc911\uc9c0\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c?
configForm.userSettings=\uc0ac\uc6a9\uc790 \ud658\uacbd \uc124\uc815
\uc815\ubcf4
-configForm.accountActivation=\uc0c8 \uc0ac\uc6a9\uc790\uac00
\uc804\uc790\uc6b0\ud3b8\uc744 \ud1b5\ud574 \uacc4\uc815 \ud65c\uc131\ud654
\ud544\uc694
-configForm.accountActivationFromAddress=\uacc4\uc815 \ud65c\uc131\ud654
\uba54\uc2dc\uc9c0\ub97c \uc704\ud55c \uc804\uc790\uc6b0\ud3b8 \uc8fc\uc18c
+configForm.requireEmailActivation=\uc0c8 \uc0ac\uc6a9\uc790\uac00
\uc804\uc790\uc6b0\ud3b8\uc744 \ud1b5\ud574 \uacc4\uc815 \ud65c\uc131\ud654
\ud544\uc694
configForm.allowNewUsers=\uc0c8 \uc0ac\uc6a9\uc790\ub4e4\uc744
\ud5c8\uc6a9\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c?
configForm.registrationUrl=\uc678\ubd80 \ub4f1\ub85d URL
configForm.editorPages=\ud3b8\uc9d1 \ud398\uc774\uc9c0\ub4e4
Modified:
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/runtimeConfigDefs.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/runtimeConfigDefs.xml?rev=1614740&r1=1614739&r2=1614740&view=diff
==============================================================================
---
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/runtimeConfigDefs.xml
(original)
+++
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/runtimeConfigDefs.xml
Wed Jul 30 18:57:53 2014
@@ -82,31 +82,27 @@
<type>boolean</type>
<default-value>false</default-value>
</property-def>
- <property-def name="site.allowUserWeblogCreation"
key="configForm.allowUserWeblogCreation">
- <type>boolean</type>
- <default-value>true</default-value>
- </property-def>
</display-group >
<!-- User Settings Group -->
<display-group name="userSettings" key="configForm.userSettings" >
- <property-def name="users.registration.enabled"
key="configForm.allowNewUsers">
+ <property-def name="users.registration.enabled"
key="configForm.allowNewUsers">
<type>boolean</type>
<default-value>false</default-value>
</property-def>
- <property-def name="user.account.activation.enabled"
key="configForm.accountActivation">
+ <property-def name="user.account.email.activation"
key="configForm.requireEmailActivation">
<type>boolean</type>
<default-value>false</default-value>
</property-def>
- <property-def name="user.account.activation.mail.from"
key="configForm.accountActivationFromAddress">
- <type>string</type>
- <default-value></default-value>
- </property-def>
<property-def name="users.registration.url"
key="configForm.registrationUrl">
<type>string</type>
<default-value></default-value>
</property-def>
+ <property-def name="site.allowUserWeblogCreation"
key="configForm.allowUserWeblogCreation">
+ <type>boolean</type>
+ <default-value>true</default-value>
+ </property-def>
<property-def name="users.editor.pages" key="configForm.editorPages">
<type>text</type>
<default-value>editor-text.jsp,editor-xinha.jsp</default-value>
