Skip to content

S
solo-1
Commit 6911aa24 authored by Liang Ding's avatar Liang Ding
Browse files
Options

项目名调整 B3log Solo -> Solo

parent 70a5997f
Hide whitespace changes
Inline Side-by-side
Showing with 158 additions and 107 deletions
CHANGE_LOGS.html
View file @ 6911aa24
<!DOCTYPE html>
<html>
<head>
<title>B3log Solo Change Logs</title>
<title>Solo Change Logs</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
</head>
<body>
......
core/pom.xml
View file @ 6911aa24
<?xml version="1.0" encoding="UTF-8"?>
<!-- Description: B3log Solo core. Version: 2.2.1.7, Mar 24, 2015 Author:
Liang Ding -->
<!--
Description: Solo core.
Version: 2.2.1.7, Mar 24, 2015
Author: Liang Ding
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>solo-core</artifactId>
<packaging>jar</packaging>
<name>B3log Solo (Core)</name>
<description>B3log Solo Core.</description>
<name>Solo (Core)</name>
<description>Solo Core.</description>
<parent>
<groupId>org.b3log</groupId>
......
core/src/main/java/org/b3log/solo/SoloServletListener.java
View file @ 6911aa24
......@@ -52,7 +52,7 @@ import org.json.JSONObject;
/**
* B3log Solo servlet listener.
* Solo servlet listener.
*
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.2.0.6, Mar 24, 2015
......@@ -61,7 +61,7 @@ import org.json.JSONObject;
public final class SoloServletListener extends AbstractServletListener {
/**
* B3log Solo version.
* Solo version.
*/
public static final String VERSION = "0.6.8";
......@@ -217,7 +217,7 @@ public final class SoloServletListener extends AbstractServletListener {
try {
preference = preferenceRepository.get(Preference.PREFERENCE);
if (null == preference) {
LOGGER.log(Level.WARN, "Can't not init default skin, please init B3log Solo first");
LOGGER.log(Level.WARN, "Can't not init default skin, please init Solo first");
return;
}
......
core/src/main/java/org/b3log/solo/filter/InitCheckFilter.java
View file @ 6911aa24
......@@ -96,7 +96,7 @@ public final class InitCheckFilter implements Filter {
return;
}
LOGGER.log(Level.INFO, "B3log Solo has not been initialized, so redirects to /init");
LOGGER.log(Level.INFO, "Solo has not been initialized, so redirects to /init");
final HTTPRequestContext context = new HTTPRequestContext();
......
core/src/main/java/org/b3log/solo/model/Preference.java
View file @ 6911aa24
......@@ -264,7 +264,7 @@ public final class Preference {
/**
* Default blog title.
*/
public static final String DEFAULT_BLOG_TITLE = "B3log Solo 示例";
public static final String DEFAULT_BLOG_TITLE = "Solo 示例";
/**
* Default blog subtitle.
......
core/src/main/java/org/b3log/solo/package-info.java
View file @ 6911aa24
/**
* <a href="https://github.com/b3log/b3log-solo">B3log Solo</a>.
* <a href="https://github.com/b3log/b3log-solo">Solo</a>.
*/
package org.b3log.solo;
core/src/main/java/org/b3log/solo/processor/FeedProcessor.java
View file @ 6911aa24
......@@ -377,7 +377,7 @@ public class FeedProcessor {
channel.setLastBuildDate(new Date());
channel.setLink(Latkes.getServePath());
channel.setAtomLink(Latkes.getServePath() + "/blog-articles-rss.do");
channel.setGenerator("B3log Solo, ver " + SoloServletListener.VERSION);
channel.setGenerator("Solo, ver " + SoloServletListener.VERSION);
final String localeString = preference.getString(Preference.LOCALE_STRING);
final String country = Locales.getCountry(localeString).toLowerCase();
final String language = Locales.getLanguage(localeString).toLowerCase();
......@@ -510,7 +510,7 @@ public class FeedProcessor {
channel.setLastBuildDate(new Date());
channel.setLink(Latkes.getServePath());
channel.setAtomLink(Latkes.getServePath() + "/tag-articles-rss.do");
channel.setGenerator("B3log Solo, ver " + SoloServletListener.VERSION);
channel.setGenerator("Solo, ver " + SoloServletListener.VERSION);
final String localeString = preference.getString(Preference.LOCALE_STRING);
final String country = Locales.getCountry(localeString).toLowerCase();
final String language = Locales.getLanguage(localeString).toLowerCase();
......
core/src/main/java/org/b3log/solo/processor/InitProcessor.java
View file @ 6911aa24
......@@ -15,7 +15,6 @@
*/
package org.b3log.solo.processor;
import java.util.Calendar;
import java.util.Locale;
import java.util.Map;
......@@ -47,12 +46,11 @@ import org.b3log.solo.service.InitService;
import org.b3log.solo.util.QueryResults;
import org.json.JSONObject;
/**
* B3log Solo initialization service.
* Solo initialization service.
*
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.0.0.6, Jun 28, 2013
* @version 1.1.0.6, May 19, 2015
* @since 0.4.0
*/
@RequestProcessor
......@@ -81,17 +79,27 @@ public class InitProcessor {
@Inject
private LangPropsService langPropsService;
/**
* Max user name length.
*/
public static final int MAX_USER_NAME_LENGTH = 20;
/**
* Min user name length.
*/
public static final int MIN_USER_NAME_LENGTH = 1;
/**
* Shows initialization page.
*
*
* @param context the specified http request context
* @param request the specified http servlet request
* @param response the specified http servlet response
* @throws Exception exception
* @throws Exception exception
*/
@RequestProcessing(value = "/init", method = HTTPRequestMethod.GET)
public void showInit(final HTTPRequestContext context, final HttpServletRequest request, final HttpServletResponse response)
throws Exception {
throws Exception {
if (initService.isInited()) {
response.sendRedirect("/");
......@@ -118,8 +126,8 @@ public class InitProcessor {
}
/**
* Initializes B3log Solo.
*
* Initializes Solo.
*
* @param context the specified http request context
* @param request the specified http servlet request, for example,
* <pre>
......@@ -129,12 +137,13 @@ public class InitProcessor {
* "userPassword": ""
* }
* </pre>
*
* @param response the specified http servlet response
* @throws Exception exception
* @throws Exception exception
*/
@RequestProcessing(value = "/init", method = HTTPRequestMethod.POST)
public void initB3logSolo(final HTTPRequestContext context, final HttpServletRequest request,
final HttpServletResponse response) throws Exception {
final HttpServletResponse response) throws Exception {
if (initService.isInited()) {
response.sendRedirect("/");
......@@ -163,6 +172,12 @@ public class InitProcessor {
return;
}
if (invalidUserName(userName)) {
ret.put(Keys.MSG, "Init failed, please check your input [username: length [1, 20], content {a-z, A-Z, 0-9, _}]");
return;
}
final Locale locale = Locales.getLocale(request);
requestJSONObject.put(Keys.LOCALE, locale.toString());
......@@ -186,4 +201,38 @@ public class InitProcessor {
ret.put(Keys.MSG, e.getMessage());
}
}
/**
* Checks whether the specified name is invalid.
*
* <p>
* A valid user name:
* <ul>
* <li>length [1, 20]</li>
* <li>content {a-z, A-Z, 0-9, _}</li>
* </ul>
* </p>
*
* @param name the specified name
* @return {@code true} if it is invalid, returns {@code false} otherwise
*/
public static boolean invalidUserName(final String name) {
final int length = name.length();
if (length < MIN_USER_NAME_LENGTH || length > MAX_USER_NAME_LENGTH) {
return true;
}
char c;
for (int i = 0; i < length; i++) {
c = name.charAt(i);
if (('a' <= c && c <= 'z') || ('A' <= c && c <= 'Z') || '0' <= c && c <= '9' || '_' == c) {
continue;
}
return true;
}
return false;
}
}
core/src/main/java/org/b3log/solo/processor/StatProcessor.java
View file @ 6911aa24
......@@ -30,7 +30,7 @@ import org.b3log.solo.service.StatisticMgmtService;
* Statistics processor.
*
* <p>
* Statistics of B3log Solo:
* Statistics of Solo:
*
* <ul>
* <li>{@link #viewCounter(org.b3log.latke.servlet.HTTPRequestContext) Blog/Article view counting}</li>
......
core/src/main/java/org/b3log/solo/processor/UpgradeProcessor.java
View file @ 6911aa24
......@@ -158,7 +158,7 @@ public class UpgradeProcessor {
} catch (final Exception e) {
LOGGER.log(Level.ERROR, e.getMessage(), e);
renderer.setContent(
"Upgrade failed [" + e.getMessage() + "], please contact the B3log Solo developers or reports this "
"Upgrade failed [" + e.getMessage() + "], please contact the Solo developers or reports this "
+ "issue directly (<a href='https://github.com/b3log/b3log-solo/issues/new'>"
+ "https://github.com/b3log/b3log-solo/issues/new</a>) ");
}
......@@ -274,7 +274,7 @@ public class UpgradeProcessor {
}
/**
* Send an email to the user who upgrades B3log Solo with a discontinuous version.
* Send an email to the user who upgrades Solo with a discontinuous version.
*
* @throws ServiceException ServiceException
* @throws JSONException JSONException
......@@ -289,6 +289,6 @@ public class UpgradeProcessor {
message.setSubject(langPropsService.get("skipVersionMailSubject"));
message.setHtmlBody(langPropsService.get("skipVersionMailBody"));
MAIL_SVC.send(message);
LOGGER.info("Send an email to the user who upgrades B3log Solo with a discontinuous version.");
LOGGER.info("Send an email to the user who upgrades Solo with a discontinuous version.");
}
}
core/src/main/java/org/b3log/solo/service/InitService.java
View file @ 6911aa24
......@@ -58,7 +58,7 @@ import org.json.JSONObject;
/**
* B3log Solo initialization service.
* Solo initialization service.
*
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.0.2.7, Apr 15, 2014
......@@ -160,13 +160,13 @@ public class InitService {
return null != admin;
} catch (final RepositoryException e) {
LOGGER.log(Level.WARN, "B3log Solo has not been initialized");
LOGGER.log(Level.WARN, "Solo has not been initialized");
return false;
}
}
/**
* Initializes B3log Solo.
* Initializes Solo.
*
* <p>
* Initializes the followings in sequence:
......@@ -178,11 +178,11 @@ public class InitService {
* </p>
*
* <p>
* We will try to initialize B3log Solo 3 times at most.
* We will try to initialize Solo 3 times at most.
* </p>
*
* <p>
* Posts "Hello World!" article and its comment while B3log Solo initialized.
* Posts "Hello World!" article and its comment while Solo initialized.
* </p>
*
* @param requestJSONObject the specified request json object, for example,
......@@ -204,7 +204,7 @@ public class InitService {
final RuntimeEnv runtimeEnv = Latkes.getRuntimeEnv();
if (RuntimeEnv.LOCAL == runtimeEnv) {
LOGGER.log(Level.INFO, "B3log Solo is running on [" + runtimeEnv + "] environment, database [{0}], creates all tables",
LOGGER.log(Level.INFO, "Solo is running on [" + runtimeEnv + "] environment, database [{0}], creates all tables",
Latkes.getRuntimeDatabase());
final List<CreateTableResult> createTableResults = JdbcRepositories.initAllTables();
......@@ -233,13 +233,13 @@ public class InitService {
break;
} catch (final Exception e) {
if (0 == retries) {
LOGGER.log(Level.ERROR, "Initialize B3log Solo error", e);
throw new ServiceException("Initailize B3log Solo error: " + e.getMessage());
LOGGER.log(Level.ERROR, "Initialize Solo error", e);
throw new ServiceException("Initailize Solo error: " + e.getMessage());
}
// Allow retry to occur
--retries;
LOGGER.log(Level.WARN, "Retrying to init B3log Solo[retries={0}]", retries);
LOGGER.log(Level.WARN, "Retrying to init Solo[retries={0}]", retries);
} finally {
if (transaction.isActive()) {
transaction.rollback();
......
core/src/main/java/org/b3log/solo/service/PreferenceMgmtService.java
View file @ 6911aa24
......@@ -123,7 +123,7 @@ public class PreferenceMgmtService {
LOGGER.log(Level.ERROR, "Can not find skin[dirName=ease]");
throw new IllegalStateException(
"Can not find default skin[dirName=ease], please redeploy your B3log Solo and make sure contains this default skin!");
"Can not find default skin[dirName=ease], please redeploy your Solo and make sure contains this default skin!");
}
preference.put(SKIN_DIR_NAME, "ease");
......
core/src/main/java/org/b3log/solo/service/UserMgmtService.java
View file @ 6911aa24
......@@ -179,7 +179,7 @@ public class UserMgmtService {
final String newHashedPassword = MD5.hash(userPassword);
final String oldHashedPassword = oldUser.optString(User.USER_PASSWORD);
if (!"demo.b3log.org".equals(Latkes.getServerHost())) { // Skips the B3log Solo Online Demo (http://demo.b3log.org)
if (!"demo.b3log.org".equals(Latkes.getServerHost())) { // Skips the Solo Online Demo (http://demo.b3log.org)
if (!mybeHashed || (!oldHashedPassword.equals(userPassword) && !oldHashedPassword.equals(newHashedPassword))) {
oldUser.put(User.USER_PASSWORD, newHashedPassword);
}
......
core/src/test/java/org/b3log/solo/util/MarkdownsTestCase.java
View file @ 6911aa24
......@@ -46,7 +46,7 @@ public final class MarkdownsTestCase {
Assert.assertNull(html);
markdownText = "# B3log Solo Markdown Editor";
markdownText = "# Solo Markdown Editor";
html = Markdowns.toHTML(markdownText);
System.out.println(html);
......
core/src/test/resources/lang_zh_CN.properties
View file @ 6911aa24
......@@ -15,7 +15,7 @@
#
#
# Description: B3log Solo default language configurations(zh_CN) for testing.
# Description: Solo default language configurations(zh_CN) for testing.
# Version: 1.0.0.0, Sep 11, 2012
# Author: Liang Ding
#
......
core/src/test/resources/log4j.properties
View file @ 6911aa24
......@@ -15,7 +15,7 @@
#
#
# Description: B3log Solo logging configurations for tesing.
# Description: Solo logging configurations for tesing.
# Version: 1.0.0.0, Jul 8, 2013
# Author: Liang Ding
#
......
pom.xml
View file @ 6911aa24
<?xml version="1.0" encoding="UTF-8"?>
<!--
Description: B3log Solo parent POM.
Description: Solo parent POM.
Version: 2.2.4.20, Mar 24, 2015
Author: Liang Ding
-->
......@@ -12,11 +12,10 @@
<artifactId>solo</artifactId>
<packaging>pom</packaging>
<version>0.6.8</version>
<name>B3log Solo</name>
<name>Solo</name>
<url>https://github.com/b3log/b3log-solo</url>
<description>
B3log Solo is a blogging program, which could run on Google App Engine
or a standard Servlet container.
A Java blogging system, feel free to create your or your team own blog.
</description>
<inceptionYear>2010</inceptionYear>
......@@ -324,7 +323,7 @@
</plugins>
<finalName>b3log-solo</finalName>
<finalName>solo</finalName>
</build>
<repositories>
......
war/gae/pom.xml
View file @ 6911aa24
<?xml version="1.0" encoding="UTF-8"?>
<!--
Description: B3log Solo GAE POM.
Description: Solo GAE POM.
Version: 2.1.2.7, Mar 24, 2015
Author: Liang Ding
-->
......@@ -10,9 +10,9 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>solo-gae</artifactId>
<packaging>war</packaging>
<name>B3log Solo (GAE)</name>
<name>Solo (GAE)</name>
<description>
B3log Solo Google App Engine war.
Solo Google App Engine war.
</description>
<parent>
......@@ -178,7 +178,7 @@
</plugins>
<finalName>b3log-solo-gae</finalName>
<finalName>solo-gae</finalName>
</build>
</project>
war/gae/src/main/resources/logging.properties
View file @ 6911aa24
......@@ -15,7 +15,7 @@
#
#
# Description: B3log Solo JDK logging configurations. Add the following to appengine-web.xml:
# Description: Solo JDK logging configurations. Add the following to appengine-web.xml:
# <system-properties>
# <property name="java.util.logging.config.file" value="WEB-INF/classes/logging.properties"/>
# </system-properties>
......
war/h2/pom.xml
View file @ 6911aa24
<?xml version="1.0" encoding="UTF-8"?>
<!--
Description: B3log Solo (H2) standard Servlet container POM.
Description: Solo (H2) standard Servlet container POM.
Version: 1.1.0.5, Mar 24, 2015
Author: Liang Ding
-->
......@@ -11,9 +11,9 @@
<groupId>org.b3log</groupId>
<artifactId>solo-h2</artifactId>
<packaging>war</packaging>
<name>B3log Solo (H2)</name>
<name>Solo (H2)</name>
<description>
B3log Solo (H2) standard Servlet container war.
Solo (H2) standard Servlet container war.
</description>
<parent>
......@@ -108,7 +108,7 @@
</plugins>
<finalName>b3log-solo-h2</finalName>
<finalName>solo-h2</finalName>
</build>
</project>
war/h2/src/main/resources/local.properties
View file @ 6911aa24
......@@ -15,9 +15,9 @@
#
#
# Description: B3log Solo local environment configurations. Configures this file
# if B3log Solo runs on a standard Servlet container or Baidu App Engine,
# it is unnecessary to care this file if B3log Solo runs on Google App Engine.
# Description: Solo local environment configurations. Configures this file
# if Solo runs on a standard Servlet container or Baidu App Engine,
# it is unnecessary to care this file if Solo runs on Google App Engine.
# Version: 1.0.2.6, Feb 11, 2015
# Author: Liang Ding
#
......
war/h2/src/main/resources/mail.properties
View file @ 6911aa24
......@@ -15,9 +15,9 @@
#
#
# Description: B3log Solo mail configurations. Configures this file if B3log Solo
# Description: Solo mail configurations. Configures this file if Solo
# runs on standard Servlet container, it is unnecessary to change
# this file if B3log Solo runs on Google App Engine.
# this file if Solo runs on Google App Engine.
# Version: 1.0.0.3, Jan 4, 2013
# Author: Liang Ding
#
......
war/mysql/pom.xml
View file @ 6911aa24
<?xml version="1.0" encoding="UTF-8"?>
<!--
Description: B3log Solo (MySQL) standard Servlet container POM.
Description: Solo (MySQL) standard Servlet container POM.
Version: 1.1.1.6, Mar 24, 2015
Author: Liang Ding
-->
......@@ -10,9 +10,9 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>solo-mysql</artifactId>
<packaging>war</packaging>
<name>B3log Solo (MySQL)</name>
<name>Solo (MySQL)</name>
<description>
B3log Solo (MySQL) standard Servlet container war.
Solo (MySQL) standard Servlet container war.
</description>
<parent>
......@@ -102,7 +102,7 @@
</plugins>
<finalName>b3log-solo-mysql</finalName>
<finalName>solo-mysql</finalName>
</build>
</project>
war/mysql/src/main/resources/local.properties
View file @ 6911aa24
......@@ -15,9 +15,9 @@
#
#
# Description: B3log Solo local environment configurations. Configures this file
# if B3log Solo runs on a standard Servlet container or Baidu App Engine,
# it is unnecessary to care this file if B3log Solo runs on Google App Engine.
# Description: Solo local environment configurations. Configures this file
# if Solo runs on a standard Servlet container or Baidu App Engine,
# it is unnecessary to care this file if Solo runs on Google App Engine.
# Version: 1.0.2.6, Feb 11, 2015
# Author: Liang Ding
#
......
war/mysql/src/main/resources/mail.properties
View file @ 6911aa24
......@@ -15,9 +15,9 @@
#
#
# Description: B3log Solo mail configurations. Configures this file if B3log Solo
# Description: Solo mail configurations. Configures this file if Solo
# runs on standard Servlet container, it is unnecessary to change
# this file if B3log Solo runs on Google App Engine.
# this file if Solo runs on Google App Engine.
# Version: 1.0.0.3, Jan 4, 2013
# Author: Liang Ding
#
......
war/pom.xml
View file @ 6911aa24
<?xml version="1.0" encoding="UTF-8"?>
<!--
Description: B3log Solo WAR POM.
Description: Solo WAR POM.
Version: 2.1.2.11, Mar 24, 2015
Author: Liang Ding
-->
......@@ -10,9 +10,9 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>solo-war</artifactId>
<packaging>pom</packaging>
<name>B3log Solo (WAR)</name>
<name>Solo (WAR)</name>
<description>
B3log Solo standard Servlet container war.
Solo standard Servlet container war.
</description>
<parent>
......
war/src/main/resources/lang_en_US.properties
View file @ 6911aa24
......@@ -15,7 +15,7 @@
#
#
# Description: B3log Solo language configurations(en_US).
# Description: Solo language configurations(en_US).
# Version: 2.2.2.1, Jul 8, 2014
# Author: Liang Ding
# Author: Liyuan Li
......@@ -52,7 +52,7 @@ checkingVersionLabel=Checking for updates....
upToDateLabel=Your Solo is up to date ;-)
outOfDateLabel=Your Solo is out of date ;-(, download the latest version:
aboutLabel=About
aboutContentLabel=<p><a href="https://github.com/b3log/b3log-solo" target="_blank">B3log Solo</a> \
aboutContentLabel=<p><a href="https://github.com/b3log/b3log-solo" target="_blank">Solo</a> \
is an open source (<a href="http://www.apache.org/licenses/LICENSE-2.0.html" target="_blank">Apache License 2.0</a>) blogging program, which can run on <a href="http://code.google.com/appengine" target="_blank">Google App Engine</a> and a standard Servlet container.</p>\
<p><a href="http://b3log.org" target="_blank">B3log</a> advocates the rights of equality, freedom and passion, and we are trying to create a bran-new experience about individual blogging + community. Sound interesting? <a href="https://github.com/b3log/b3log-solo/wiki/Join_us" target="_blank">Join us</a>!</p>\
<a target="blank" href="http://b3log.org/donate.html">\
......@@ -263,12 +263,12 @@ sendLabel=Send
userEmailNotFoundMsg=Sorry, email not found.
resetPwdSuccessMsg=Password reset successfully.
resetPwdSuccessSend=Check your e-mail for the confirmation link.
resetPwdMailSubject=[B3log Solo]Password Reset
resetPwdMailSubject=[Solo]Password Reset
resetPwdMailBody=To reset your password please open the link below. If this is a mistake just ignore this email - your password will not be changed.<p>
initIntroLabel= <p>Please click "Initial" button to initialize your blog ;-)</br></br>\
Welcome to the <a href="http://symphony.b3log.org" target="_blank">B3log Symphony community</a> of <b>Equality \u2022 Freedom \u2022 Passion</b> at the same time.</br></br>\
<span style="font-size:12px"><span style="color:red">Note</span>: Only to ensure Email is the same and <a href="/article/1353772377257" target="_blank">synchronization configured</a> is correctly,\
Your posts and comments can <i>maintain bisynchronous</i> in the community and the B3log Solo.</p>
Your posts and comments can <i>maintain bisynchronous</i> in the community and the Solo.</p>
killBrowserLabel=<h2>Let's kill outdated and insecure browser!</h2><p>Let's kill outdated and insecure browser for browser evolution, human progress and better experience.</p><p>You can download</p><ul><li><a href="http://www.mozilla.com/" target="_blank">Firefox</a></li><li><a href="http://www.google.com/chrome" target="_blank">Chrome</a></li><li><a href="http://windows.microsoft.com/en-US/internet-explorer/downloads/ie" target="_blank">IE8 / IE9</a></li><li><a href="http://www.maxthon.com/" target="_blank">Maxthon</a> and <a href="http://www.google.com" target="_blank">so on</a>.</li></ul><span style="font-size: 10px">Tip: Remove "Util.killIE();" in /js/common.js can support all browser.</span>
closeLabel=Close
closeForeverLabel=Close Forever
......@@ -366,11 +366,11 @@ confirmInitLabel=Are You Sure?
###### Common ######
b3logLabel=<span style="color: orange;">B</span><span style="color: blue;"><sup>3</sup></span><span style="color: green;">L</span><span style="color: red;">O</span><span style="color: blue;">G</span>
mobileLabel=Mobile Theme
# Send an email to the user who upgrades B3log Solo with a discontinuous version #
skipVersionMailSubject=[no-reply]Better not to skip more than one version to upgrade B3log Solo
skipVersionMailBody=Hey, sorry for any inconvenience caused. If your B3log Solo is too old to upgrade, \
# Send an email to the user who upgrades Solo with a discontinuous version #
skipVersionMailSubject=[no-reply]Better not to skip more than one version to upgrade Solo
skipVersionMailBody=Hey, sorry for any inconvenience caused. If your Solo is too old to upgrade, \
developers in <a href="http://b3log.org" target="_blank">B3log</a> are more than welcome to help, thank you.
skipVersionAlert=Your B3log Solo is too old to upgrade, please contact the B3log Solo's developers.
skipVersionAlert=Your Solo is too old to upgrade, please contact the Solo's developers.
helloWorld.title=Hello World!
helloWorld.content=<p>Welcome to \
<a style="text-decoration: none;" target="_blank" href="https://github.com/b3log/b3log-solo">\
......
war/src/main/resources/lang_zh_CN.properties
View file @ 6911aa24
......@@ -15,7 +15,7 @@
#
#
# Description: B3log Solo default language configurations(zh_CN).
# Description: Solo default language configurations(zh_CN).
# Version: 2.2.3.8, Jul 8, 2014
# Author: Liang Ding
# Author: Liyuan Li
......@@ -52,7 +52,7 @@ checkingVersionLabel=\u6b63\u5728\u68c0\u67e5\u7248\u672c\u66f4\u65b0....
upToDateLabel=\u60a8\u6b63\u5728\u4f7f\u7528\u6700\u65b0\u7684 Solo ;-)
outOfDateLabel=\u60a8\u7684 Solo \u8fc7\u65f6\u4e86 ;-(\uff0c\u8bf7\u4e0b\u8f7d\u6700\u65b0\u7248\u672c\uff1a
aboutLabel=\u5173\u4e8e
aboutContentLabel=<p><a href="https://github.com/b3log/b3log-solo" target="_blank">B3log Solo</a> \
aboutContentLabel=<p><a href="https://github.com/b3log/b3log-solo" target="_blank">Solo</a> \
\u662f\u4e00\u6b3e\u5f00\u6e90\uff08<a href="http://www.apache.org/licenses/LICENSE-2.0.html" target="_blank">Apache License 2.0</a>\uff09\u7684\u535a\u5ba2\u7a0b\u5e8f\uff0c\u4e0d\u4ec5\u53ef\u4ee5\u5728\u591a\u79cd\u4e91\u5e73\u53f0\u4e0a\u8fd0\u884c\uff0c\u4e5f\u53ef\u4ee5\u5728\u6807\u51c6 Servlet \u5bb9\u5668\u4e0a\u8fd0\u884c\u3002</p>\
<p><a href="http://b3log.org" target="_blank">B3log</a> \u63d0\u5021\u5e73\u7b49\u3001\u81ea\u7531\u3001\u5954\u653e\uff0c\u5e76\u6b63\u5728\u5c1d\u8bd5\u6784\u5efa\u4e2a\u4eba\u535a\u5ba2+\u8bba\u575b\u7684\u4e92\u52a8\u4f53\u9a8c\u3002\u5982\u679c\u60a8\u6709\u5174\u8da3\uff0c<a href="https://github.com/b3log/b3log-solo/wiki/Join_us" target="_blank">\u52a0\u5165\u6211\u4eec</a>\u5427\uff01\
</p><a target="blank" href="http://b3log.org/donate.html">\
......@@ -263,11 +263,11 @@ sendLabel=\u53d1\u9001
userEmailNotFoundMsg=\u90ae\u7bb1\u5730\u5740\u6709\u8bef\uff0c\u8bf7\u91cd\u8bd5
resetPwdSuccessMsg=\u5bc6\u7801\u4fee\u6539\u6210\u529f
resetPwdSuccessSend=\u66f4\u6539\u5bc6\u7801\u7684\u786e\u8ba4\u94fe\u63a5\u5df2\u53d1\u9001\u81f3\u6307\u5b9a\u90ae\u7bb1
resetPwdMailSubject=[B3log Solo]\u91cd\u7f6e\u5bc6\u7801
resetPwdMailSubject=[Solo]\u91cd\u7f6e\u5bc6\u7801
resetPwdMailBody=\u60f3\u66f4\u6539\u5bc6\u7801\uff0c\u8bf7\u6253\u5f00\u4e0b\u9762\u94fe\u63a5\uff1b\u82e5\u4e0d\u60f3\u4fee\u6539\uff0c\u53ea\u8981\u5ffd\u7565\u6b64\u6b21\u90ae\u4ef6\uff0c\u7cfb\u7edf\u5e76\u4e0d\u4f1a\u81ea\u52a8\u4fee\u6539\u60a8\u7684\u5bc6\u7801\u3002<p>
initIntroLabel=<p>\u8bf7\u70b9\u51fb\u4e0b\u9762\u7684\u201c\u521d\u59cb\u5316\u201d\u6309\u94ae\u8fdb\u884c\u521d\u59cb\u5316\uff0c\u7136\u540e\u7a0d\u7b49\u7247\u523b ;-)</br></br></br></br>\
\u540c\u65f6\uff0c\u6b22\u8fce\u60a8\u52a0\u5165<b>\u5e73\u7b49\u2022\u81ea\u7531\u2022\u5954\u653e</b>\u7684 <a href="http://symphony.b3log.org" target="_blank">B3log Symphony \u793e\u533a</a>\u3002</br></br>\
<span style="font-size:12px"><span style="color:red">\u6ce8</span>\uff1a\u5f53\u6ce8\u518c Email \u4e0e B3log Solo \u4fdd\u6301\u4e00\u81f4\uff0c\u5e76\u4e14\u793e\u533a\u4e2d\u7684<a href="http://symphony.b3log.org/article/1353772377257" target="_blank">\u540c\u6b65\u8bbe\u7f6e</a>\u914d\u7f6e\u6b63\u786e\u65f6\uff0c\
<span style="font-size:12px"><span style="color:red">\u6ce8</span>\uff1a\u5f53\u6ce8\u518c Email \u4e0e Solo \u4fdd\u6301\u4e00\u81f4\uff0c\u5e76\u4e14\u793e\u533a\u4e2d\u7684<a href="http://symphony.b3log.org/article/1353772377257" target="_blank">\u540c\u6b65\u8bbe\u7f6e</a>\u914d\u7f6e\u6b63\u786e\u65f6\uff0c\
\u60a8\u7684\u6587\u7ae0\u548c\u8bc4\u8bba\u5c31\u53ef\u5728\u793e\u533a\u548c\u4e2a\u4eba\u535a\u5ba2\u4e2d\u4fdd\u6301<i>\u53cc\u5411\u540c\u6b65</i>\u3002</span></p>
killBrowserLabel=<h2>\u8ba9\u6211\u4eec\u653e\u5f03\u4f7f\u7528\u90a3\u4e9b\u8fc7\u65f6\u3001\u4e0d\u5b89\u5168\u7684\u6d4f\u89c8\u5668\u5427\uff01</h2><p>\u4e3a\u4e86\u8ba9\u6d4f\u89c8\u5668\u66f4\u597d\u7684\u53d1\u5c55\uff0c\u4eba\u7c7b\u66f4\u52a0\u7684\u8fdb\u6b65\uff0c\u62e5\u6709\u66f4\u597d\u7684\u4f53\u9a8c\uff0c\u8ba9\u6211\u4eec\u653e\u5f03\u4f7f\u7528\u90a3\u4e9b\u8fc7\u65f6\u3001\u4e0d\u5b89\u5168\u7684\u6d4f\u89c8\u5668\u3002</p>\u60a8\u53ef\u4ee5\u4e0b\u8f7d<ul><li><a href="http://www.mozilla.com/" target="_blank">\u706b\u72d0</a></li><li><a href="http://www.google.com/chrome" target="_blank">\u8c37\u6b4c\u6d4f\u89c8\u5668</a></li><li><a href="http://windows.microsoft.com/en-US/internet-explorer/downloads/ie" target="_blank">IE8 / IE9</a></li><li><a href="http://www.maxthon.com/" target="_blank">\u9068\u6e38</a>\u6216\u8005<a href="http://www.google.com" target="_blank">\u5176\u5b83\u6d4f\u89c8\u5668</a>.</li></ul><span style="font-size: 10px">\u6ce8\uff1a\u5220\u9664 /js/common.js \u4e2d\u7684 Util.killIE(); \u53ef\u5bf9\u6240\u6709\u6d4f\u89c8\u5668\u8fdb\u884c\u652f\u6301\u3002</span>
closeLabel=\u5173\u95ed
......@@ -366,11 +366,11 @@ confirmInitLabel=\u786e\u5b9a\u8fdb\u884c\u521d\u59cb\u5316\u5417\uff1f
###### Common ######
b3logLabel=<span style="color: orange;">B</span><span style="color: blue;"><sup>3</sup></span><span style="color: green;">L</span><span style="color: red;">O</span><span style="color: blue;">G</span>
mobileLabel=\u79fb\u52a8\u7248
# Send an email to the user who upgrades B3log Solo with a discontinuous version #
skipVersionMailSubject=[\u65e0\u9700\u56de\u590d]\u8de8\u7248\u672c\u5347\u7ea7 B3log Solo \u63d0\u9192
skipVersionMailBody=Hey, \u60a8\u597d\uff01<p>\u975e\u5e38\u9ad8\u5174\u60a8\u51c6\u5907\u5347\u7ea7 B3log Solo\uff0c\u4e0d\u8fc7\u76ee\u524d\u8fd8\u4e0d\u652f\u6301\u8de8\u7248\u672c\u5347\u7ea7\uff0c\u8bf7\u6309\u7167\u5386\u53f2\u7248\u672c\u4f9d\u6b21\u8fdb\u884c\u5347\u7ea7\u3002</p>\
# Send an email to the user who upgrades Solo with a discontinuous version #
skipVersionMailSubject=[\u65e0\u9700\u56de\u590d]\u8de8\u7248\u672c\u5347\u7ea7 Solo \u63d0\u9192
skipVersionMailBody=Hey, \u60a8\u597d\uff01<p>\u975e\u5e38\u9ad8\u5174\u60a8\u51c6\u5907\u5347\u7ea7 Solo\uff0c\u4e0d\u8fc7\u76ee\u524d\u8fd8\u4e0d\u652f\u6301\u8de8\u7248\u672c\u5347\u7ea7\uff0c\u8bf7\u6309\u7167\u5386\u53f2\u7248\u672c\u4f9d\u6b21\u8fdb\u884c\u5347\u7ea7\u3002</p>\
<p>\u5bf9\u6b64\u7ed9\u60a8\u5e26\u6765\u7684\u4e0d\u4fbf\u6211\u4eec\u6df1\u8868\u6b49\u610f\uff0c\u8c22\u8c22\u60a8\u5bf9 <a href="http://b3log.org" target="_blank">B3log</a> \u7684\u652f\u6301\u3002</p>
skipVersionAlert=\u5bf9\u4e0d\u8d77\uff0cB3log Solo \u76ee\u524d\u8fd8\u4e0d\u652f\u6301\u8de8\u7248\u672c\u5347\u7ea7\uff0c\u8bf7\u6309\u7167\u5386\u53f2\u7248\u672c\u4f9d\u6b21\u8fdb\u884c\u5347\u7ea7\uff0c\u6216\u76f4\u63a5\u8054\u7cfb B3log \u5f00\u53d1\u8005\u3002
skipVersionAlert=\u5bf9\u4e0d\u8d77\uff0cSolo \u76ee\u524d\u8fd8\u4e0d\u652f\u6301\u8de8\u7248\u672c\u5347\u7ea7\uff0c\u8bf7\u6309\u7167\u5386\u53f2\u7248\u672c\u4f9d\u6b21\u8fdb\u884c\u5347\u7ea7\uff0c\u6216\u76f4\u63a5\u8054\u7cfb B3log \u5f00\u53d1\u8005\u3002
helloWorld.title=\u4e16\u754c\uff0c\u4f60\u597d\uff01
helloWorld.content=<p>\u6b22\u8fce\u4f7f\u7528 \
<a style="text-decoration: none;" target="_blank" href="https://github.com/b3log/b3log-solo">\
......
war/src/main/resources/log4j.properties
View file @ 6911aa24
......@@ -15,7 +15,7 @@
#
#
# Description: B3log Solo logging configurations.
# Description: Solo logging configurations.
# Version: 1.0.0.3, Feb 11, 2015
# Author: Liang Ding
#
......
war/src/main/webapp/CHANGE_LOGS.html
View file @ 6911aa24
<!DOCTYPE html>
<html>
<head>
<title>B3log Solo Change Logs</title>
<title>Solo Change Logs</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
</head>
<body>
......
war/src/main/webapp/README.txt
View file @ 6911aa24
B3log Solo is an open source Java blogging program.
A Java blogging system, feel free to create your or your team own blog.
Project home: https://github.com/b3log/b3log-solo
Request features/Report bugs: https://github.com/b3log/b3log-solo/issues/new
......
war/src/main/webapp/WEB-INF/web.xml
View file @ 6911aa24
......@@ -17,7 +17,7 @@
-->
<!--
Description: B3log Solo web deployment descriptor.
Description: Solo web deployment descriptor.
Version: 1.0.5.1, Sep 27, 2013
Author: Liang Ding
-->
......
war/src/main/webapp/admin-about.ftl
View file @ 6911aa24
......@@ -5,7 +5,7 @@
<div class="module-body padding12">
<div class="about-logo">
<a href="http://b3log.org" target="_blank">
<img src="${staticServePath}/images/logo.png" alt="B3log Solo" title="B3log Solo" />
<img src="${staticServePath}/images/logo.png" alt="Solo" title="Solo" />
</a>
</div>
<div class="left" style="width: 73%">
......
war/src/main/webapp/admin-index.ftl
View file @ 6911aa24
......@@ -17,7 +17,7 @@
<div id="allPanel">
<div id="top">
<a href="http://b3log.org" target="_blank" class="hover">
B3log Solo
Solo
</a>
<span class="right">
......
war/src/main/webapp/article-pwd.ftl
View file @ 6911aa24
......@@ -7,7 +7,7 @@
<meta name="description" content="An open source blog based on GAE Java,GAE Java 开源博客" />
<meta name="owner" content="B3log Team" />
<meta name="author" content="B3log Team" />
<meta name="generator" content="B3log Solo" />
<meta name="generator" content="Solo" />
<meta name="copyright" content="B3log" />
<meta name="revised" content="B3log, ${year}" />
<meta name="robots" content="noindex, follow" />
......
war/src/main/webapp/init.ftl
View file @ 6911aa24
......@@ -2,12 +2,12 @@
<html>
<head>
<meta charset="utf-8" />
<title>${welcomeToSoloLabel} B3log Solo!</title>
<title>${welcomeToSoloLabel} Solo!</title>
<meta name="keywords" content="GAE 博客,GAE blog,b3log,init" />
<meta name="description" content="An open source blog based on GAE Java,GAE Java 开源博客,初始化程序" />
<meta name="owner" content="B3log Team" />
<meta name="author" content="B3log Team" />
<meta name="generator" content="B3log Solo" />
<meta name="generator" content="Solo" />
<meta name="copyright" content="B3log" />
<meta name="revised" content="B3log, ${year}" />
<meta name="robots" content="noindex, follow" />
......
war/src/main/webapp/kill-browser.ftl
View file @ 6911aa24
......@@ -7,7 +7,7 @@
<meta name="description" content="An open source blog based on GAE Java,GAE Java 开源博客,Let's kill IE6" />
<meta name="owner" content="B3log Team" />
<meta name="author" content="B3log Team" />
<meta name="generator" content="B3log Solo" />
<meta name="generator" content="Solo" />
<meta name="copyright" content="B3log" />
<meta name="revised" content="B3log, ${year}" />
<meta http-equiv="Window-target" content="_top" />
......
war/src/main/webapp/login.ftl
View file @ 6911aa24
......@@ -2,12 +2,12 @@
<html>
<head>
<meta charset="utf-8" />
<title>${welcomeToSoloLabel} B3log Solo!</title>
<title>${welcomeToSoloLabel} Solo!</title>
<meta name="keywords" content="Java 博客,GAE blog,b3log" />
<meta name="description" content="An open source blog based on GAE Java,GAE Java 开源博客" />
<meta name="owner" content="B3log Team" />
<meta name="author" content="B3log Team" />
<meta name="generator" content="B3log Solo" />
<meta name="generator" content="Solo" />
<meta name="copyright" content="B3log" />
<meta name="revised" content="B3log, ${year}" />
<meta name="robots" content="noindex, follow" />
......
war/src/main/webapp/register.ftl
View file @ 6911aa24
......@@ -7,7 +7,7 @@
<meta name="description" content="An open source blog based on GAE Java,GAE Java 开源博客,用户注册" />
<meta name="owner" content="B3log Team" />
<meta name="author" content="B3log Team" />
<meta name="generator" content="B3log Solo" />
<meta name="generator" content="Solo" />
<meta name="copyright" content="B3log" />
<meta name="revised" content="B3log, ${year}" />
<meta http-equiv="Window-target" content="_top" />
......
war/src/main/webapp/reset-pwd.ftl
View file @ 6911aa24
......@@ -2,12 +2,12 @@
<html>
<head>
<meta charset="utf-8"/>
<title>${forgotLabel} B3log Solo!</title>
<title>${forgotLabel} Solo!</title>
<meta name="keywords" content="Java 博客,GAE blog,b3log"/>
<meta name="description" content="An open source blog based on GAE Java,GAE Java 开源博客"/>
<meta name="owner" content="B3log Team"/>
<meta name="author" content="B3log Team"/>
<meta name="generator" content="B3log Solo"/>
<meta name="generator" content="Solo"/>
<meta name="copyright" content="B3log"/>
<meta name="revised" content="B3log, ${year}"/>
<meta name="robots" content="noindex, follow"/>
......
war/src/main/webapp/skins/ease/macro-head.ftl
View file @ 6911aa24
......@@ -3,7 +3,7 @@
<title>${title}</title>
<#nested>
<meta name="author" content="${blogTitle?html}" />
<meta name="generator" content="B3log Solo" />
<meta name="generator" content="Solo" />
<meta name="copyright" content="B3log" />
<meta name="owner" content="B3log Team" />
<meta name="revised" content="${blogTitle?html}, ${year}" />
......
war/src/main/webapp/skins/mobile/macro-head.ftl
View file @ 6911aa24
......@@ -3,7 +3,7 @@
<title>${title}</title>
<#nested>
<meta name="author" content="${blogTitle?html}" />
<meta name="generator" content="B3log Solo" />
<meta name="generator" content="Solo" />
<meta name="copyright" content="B3log" />
<meta name="owner" content="B3log Team" />
<meta name="revised" content="${blogTitle?html}, ${year}" />
......
war/src/main/webapp/top-bar.ftl
View file @ 6911aa24
......@@ -64,7 +64,7 @@
<div id="showTop"></div>
<div id="top">
<a href="https://github.com/b3log/b3log-solo" target="_blank" class="hover">
B3log Solo
Solo
</a>
<span class="left">&nbsp;${onlineVisitor1Label}${onlineVisitorCnt}</span>
<span class="right" id="admin" data-login="${isLoggedIn?string}">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment