Skip to content

updated the WordPress rademark in some strings #675

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 2, 2016
Merged

updated the WordPress rademark in some strings #675

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions ee/cli/plugins/site_functions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,18 +250,18 @@ def setupwordpress(self, data):
if 'wp-pass' in data.keys() and data['wp-pass']:
ee_wp_pass = data['wp-pass']

Log.info(self, "Downloading Wordpress \t\t", end='')
Log.info(self, "Downloading WordPress \t\t", end='')
EEFileUtils.chdir(self, '{0}/htdocs/'.format(ee_site_webroot))
try:
if EEShellExec.cmd_exec(self, "wp --allow-root core"
" download"):
pass
else:
Log.info(self, "[" + Log.ENDC + Log.FAIL + "Fail" + Log.OKBLUE + "]")
raise SiteError("download wordpress core failed")
raise SiteError("download WordPress core failed")
except CommandExecutionError as e:
Log.info(self, "[" + Log.ENDC + Log.FAIL + "Fail" + Log.OKBLUE + "]")
raise SiteError(self, "download wordpress core failed")
raise SiteError(self, "download WordPress core failed")

Log.info(self, "[" + Log.ENDC + "Done" + Log.OKBLUE + "]")

Expand Down Expand Up @@ -389,7 +389,7 @@ def setupwordpress(self, data):
ee_wp_user = input('Enter WordPress username: ')
except EOFError as e:
Log.debug(self, "{0}".format(e))
raise SiteError("input wordpress username failed")
raise SiteError("input WordPress username failed")
if not ee_wp_pass:
ee_wp_pass = ee_random

Expand All @@ -400,7 +400,7 @@ def setupwordpress(self, data):
ee_wp_email = input('Enter WordPress email: ')
except EOFError as e:
Log.debug(self, "{0}".format(e))
raise SiteError("input wordpress username failed")
raise SiteError("input WordPress username failed")

try:
while not re.match(r"^[A-Za-z0-9\.\+_-]+@[A-Za-z0-9\._-]+\.[a-zA-Z]*$",
Expand Down Expand Up @@ -434,9 +434,9 @@ def setupwordpress(self, data):
log=False):
pass
else:
raise SiteError("setup wordpress tables failed for single site")
raise SiteError("setup WordPress tables failed for single site")
except CommandExecutionError as e:
raise SiteError("setup wordpress tables failed for single site")
raise SiteError("setup WordPress tables failed for single site")
else:
Log.debug(self, "Creating tables for WordPress multisite")
Log.debug(self, "php {0} --allow-root "
Expand Down Expand Up @@ -465,9 +465,9 @@ def setupwordpress(self, data):
log=False):
pass
else:
raise SiteError("setup wordpress tables failed for wp multi site")
raise SiteError("setup WordPress tables failed for wp multi site")
except CommandExecutionError as e:
raise SiteError("setup wordpress tables failed for wp multi site")
raise SiteError("setup WordPress tables failed for wp multi site")

Log.debug(self, "Updating WordPress permalink")
try:
Expand Down Expand Up @@ -518,11 +518,11 @@ def setupwordpressnetwork(self, data):
pass
else:
Log.info(self, "[" + Log.ENDC + Log.FAIL + "Fail" + Log.OKBLUE + "]")
raise SiteError("setup wordpress network failed")
raise SiteError("setup WordPress network failed")

except CommandExecutionError as e:
Log.info(self, "[" + Log.ENDC + Log.FAIL + "Fail" + Log.OKBLUE + "]")
raise SiteError("setup wordpress network failed")
raise SiteError("setup WordPress network failed")
Log.info(self, "[" + Log.ENDC + "Done" + Log.OKBLUE + "]")


Expand Down Expand Up @@ -852,7 +852,7 @@ def updatewpuserpassword(self, ee_domain, ee_site_webroot):
is_wp = EEShellExec.cmd_exec(self, "wp --allow-root core"
" version")
except CommandExecutionError as e:
raise SiteError("is wordpress site? check command failed ")
raise SiteError("is WordPress site? check command failed ")

# Exit if ee_domain is not wordpress install
if not is_wp:
Expand Down Expand Up @@ -1207,7 +1207,7 @@ def setupLetsEncrypt(self, ee_domain_name):
ee_wp_email = input('Enter WordPress email: ')
except EOFError as e:
Log.debug(self, "{0}".format(e))
raise SiteError("input wordpress username failed")
raise SiteError("input WordPress username failed")

if not os.path.isdir("/opt/letsencrypt"):
cloneLetsEncrypt(self)
Expand Down Expand Up @@ -1265,7 +1265,7 @@ def renewLetsEncrypt(self, ee_domain_name):
ee_wp_email = input('Enter email address: ')
except EOFError as e:
Log.debug(self, "{0}".format(e))
raise SiteError("Input wordpress email failed")
raise SiteError("Input WordPress email failed")

if not os.path.isdir("/opt/letsencrypt"):
cloneLetsEncrypt(self)
Expand Down