oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make UiWebsocket messages translatable

Browse source
This commit is contained in:
shortcutme 2016-11-18 20:09:51 +01:00
parent b25bf97cad
commit 0f31f1d34a
1 changed files with 39 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
src/Ui/UiWebsocket.py
View file

@ -13,6 +13,7 @@ from Site import SiteManager
from Debug import Debug from Debug import Debug
from util import QueryJson, RateLimit from util import QueryJson, RateLimit
from Plugin import PluginManager from Plugin import PluginManager
from Translate import translate as _
@PluginManager.acceptPlugins @PluginManager.acceptPlugins
@ -44,44 +45,43 @@ class UiWebsocket(object):
elif file_server.port_opened is True: elif file_server.port_opened is True:
self.site.notifications.append([ self.site.notifications.append([
"done", "done",
"Congratulation, your port <b>%s</b> is opened.<br>You are full member of ZeroNet network!" % _["Congratulation, your port <b>{0}</b> is opened.<br>You are full member of ZeroNet network!"].format(config.fileserver_port),
config.fileserver_port,
10000 10000
]) ])
elif config.tor == "always" and file_server.tor_manager.start_onions: elif config.tor == "always" and file_server.tor_manager.start_onions:
self.site.notifications.append([ self.site.notifications.append([
"done", "done",
""" _(u"""
Tor mode active, every connection using Onion route.<br> {_[Tor mode active, every connection using Onion route.]}<br>
Successfully started Tor onion hidden services. {_[Successfully started Tor onion hidden services.]}
""", """),
10000 10000
]) ])
elif config.tor == "always" and file_server.tor_manager.start_onions is not False: elif config.tor == "always" and file_server.tor_manager.start_onions is not False:
self.site.notifications.append([ self.site.notifications.append([
"error", "error",
""" _(u"""
Tor mode active, every connection using Onion route.<br> {_[Tor mode active, every connection using Onion route.]}<br>
Unable to start hidden services, please check your config. {_[Unable to start hidden services, please check your config.]}
""", """),
0 0
]) ])
elif file_server.port_opened is False and file_server.tor_manager.start_onions: elif file_server.port_opened is False and file_server.tor_manager.start_onions:
self.site.notifications.append([ self.site.notifications.append([
"done", "done",
""" _(u"""
Successfully started Tor onion hidden services.<br> {_[Successfully started Tor onion hidden services.]}<br>
For faster connections open <b>%s</b> port on your router. {_[For faster connections open <b>{0}</b> port on your router.]}
""" % config.fileserver_port, """).format(config.fileserver_port),
10000 10000
]) ])
else: else:
self.site.notifications.append([ self.site.notifications.append([
"error", "error",
""" _(u"""
Your connection is restricted. Please, open <b>%s</b> port on your router<br> {_[Your connection is restricted. Please, open <b>{0}</b> port on your router]}<br>
or configure Tor to become full member of ZeroNet network. {_[or configure Tor to become full member of ZeroNet network.]}
""" % config.fileserver_port, """).format(config.fileserver_port),
0 0
]) ])
@ -312,7 +312,7 @@ class UiWebsocket(object):
# Sign using private key sent by user # Sign using private key sent by user
signed = site.content_manager.sign(inner_path, privatekey, extend=extend, update_changed_files=update_changed_files) signed = site.content_manager.sign(inner_path, privatekey, extend=extend, update_changed_files=update_changed_files)
if not signed: if not signed:
self.cmd("notification", ["error", "Content sign failed: invalid private key."]) self.cmd("notification", ["error", _["Content signing failed"]])
self.response(to, {"error": "Site sign failed"}) self.response(to, {"error": "Site sign failed"})
return return
@ -349,7 +349,7 @@ class UiWebsocket(object):
else: else:
self.cmd( self.cmd(
"notification", "notification",
["info", "Content publish queued for %.0f seconds." % RateLimit.delayLeft(event_name, 30), 5000] ["info", _["Content publish queued for {0:.0f} seconds."].format(RateLimit.delayLeft(event_name, 30)), 5000]
) )
self.response(to, "ok") self.response(to, "ok")
# At the end display notification # At the end display notification
@ -364,7 +364,7 @@ class UiWebsocket(object):
published = thread.value published = thread.value
if published > 0: # Successfully published if published > 0: # Successfully published
if notification: if notification:
self.cmd("notification", ["done", "Content published to %s peers." % published, 5000]) self.cmd("notification", ["done", _["Content published to {0} peers."].format(published), 5000])
site.updateWebsocket() # Send updated site data to local websocket clients site.updateWebsocket() # Send updated site data to local websocket clients
if callback: if callback:
self.response(to, "ok") self.response(to, "ok")
@ -372,22 +372,22 @@ class UiWebsocket(object):
if len(site.peers) == 0: if len(site.peers) == 0:
if sys.modules["main"].file_server.port_opened or sys.modules["main"].file_server.tor_manager.start_onions: if sys.modules["main"].file_server.port_opened or sys.modules["main"].file_server.tor_manager.start_onions:
if notification: if notification:
self.cmd("notification", ["info", "No peers found, but your content is ready to access.", 5000]) self.cmd("notification", ["info", _["No peers found, but your content is ready to access."], 5000])
if callback: if callback:
self.response(to, "ok") self.response(to, "ok")
else: else:
if notification: if notification:
self.cmd("notification", [ self.cmd("notification", [
"info", "info",
"""Your network connection is restricted. Please, open <b>%s</b> port <br> _("""{_[Your network connection is restricted. Please, open <b>{0}</b> port]}<br>
on your router to make your site accessible for everyone.""" % config.fileserver_port {_[on your router to make your site accessible for everyone.]}""").format(config.fileserver_port)
]) ])
if callback: if callback:
self.response(to, {"error": "Port not opened."}) self.response(to, {"error": "Port not opened."})
else: else:
if notification: if notification:
self.cmd("notification", ["error", "Content publish failed."]) self.cmd("notification", ["error", _["Content publish failed."]])
self.response(to, {"error": "Content publish failed."}) self.response(to, {"error": "Content publish failed."})
# Write a file to disk # Write a file to disk
@ -405,7 +405,7 @@ class UiWebsocket(object):
if not found: if not found:
self.cmd( self.cmd(
"confirm", "confirm",
["This file still in sync, if you write it now, then the previous content may be lost.", "Write content anyway"], [_["This file still in sync, if you write it now, then the previous content may be lost."], _["Write content anyway"]],
lambda (res): self.actionFileWrite(to, inner_path, content_base64, ignore_bad_files=True) lambda (res): self.actionFileWrite(to, inner_path, content_base64, ignore_bad_files=True)
) )
return False return False
@ -512,16 +512,16 @@ class UiWebsocket(object):
if res is True: if res is True:
self.cmd( self.cmd(
"notification", "notification",
["done", "New certificate added: <b>%s/%s@%s</b>." % (auth_type, auth_user_name, domain)] ["done", _("{_[New certificate added:]} <b>{auth_type}/{auth_user_name}@{domain}</b>.")]
) )
self.response(to, "ok") self.response(to, "ok")
elif res is False: elif res is False:
# Display confirmation of change # Display confirmation of change
cert_current = self.user.certs[domain] cert_current = self.user.certs[domain]
body = "You current certificate: <b>%s/%s@%s</b>" % (cert_current["auth_type"], cert_current["auth_user_name"], domain) body = _("{_[You current certificate:]} <b>{cert_current[auth_type]}/{cert_current[auth_user_name]}@{domain}</b>")
self.cmd( self.cmd(
"confirm", "confirm",
[body, "Change it to %s/%s@%s" % (auth_type, auth_user_name, domain)], [body, _("Change it to {auth_type}/{auth_user_name}@{domain}")],
lambda (res): self.cbCertAddConfirm(to, domain, auth_type, auth_user_name, cert) lambda (res): self.cbCertAddConfirm(to, domain, auth_type, auth_user_name, cert)
) )
else: else:
@ -534,14 +534,14 @@ class UiWebsocket(object):
self.user.addCert(self.user.getAuthAddress(self.site.address), domain, auth_type, auth_user_name, cert) self.user.addCert(self.user.getAuthAddress(self.site.address), domain, auth_type, auth_user_name, cert)
self.cmd( self.cmd(
"notification", "notification",
["done", "Certificate changed to: <b>%s/%s@%s</b>." % (auth_type, auth_user_name, domain)] ["done", _("Certificate changed to: <b>{auth_type}/{auth_user_name}@{domain}</b>.")]
) )
self.response(to, "ok") self.response(to, "ok")
# Select certificate for site # Select certificate for site
def actionCertSelect(self, to, accepted_domains=[], accept_any=False): def actionCertSelect(self, to, accepted_domains=[], accept_any=False):
accounts = [] accounts = []
accounts.append(["", "Unique to site", ""]) # Default option accounts.append(["", _["Unique to site"], ""]) # Default option
active = "" # Make it active if no other option found active = "" # Make it active if no other option found
# Add my certs # Add my certs
@ -556,12 +556,12 @@ class UiWebsocket(object):
accounts.append([domain, title, "disabled"]) accounts.append([domain, title, "disabled"])
# Render the html # Render the html
body = "<span style='padding-bottom: 5px; display: inline-block'>Select account you want to use in this site:</span>" body = "<span style='padding-bottom: 5px; display: inline-block'>" + _["Select account you want to use in this site:"] + "</span>"
# Accounts # Accounts
for domain, account, css_class in accounts: for domain, account, css_class in accounts:
if domain == active: if domain == active:
css_class += " active" # Currently selected option css_class += " active" # Currently selected option
title = "<b>%s</b> <small>(currently selected)</small>" % account title = _(u"<b>%s</b> <small>({_[currently selected]})</small>") % account
else: else:
title = "<b>%s</b>" % account title = "<b>%s</b>" % account
body += "<a href='#Select+account' class='select select-close cert %s' title='%s'>%s</a>" % (css_class, domain, title) body += "<a href='#Select+account' class='select select-close cert %s' title='%s'>%s</a>" % (css_class, domain, title)
@ -571,11 +571,11 @@ class UiWebsocket(object):
# body+= "<small style='margin-top: 10px; display: block'>Accepted authorization providers by the site:</small>" # body+= "<small style='margin-top: 10px; display: block'>Accepted authorization providers by the site:</small>"
body += "<div style='background-color: #F7F7F7; margin-right: -30px'>" body += "<div style='background-color: #F7F7F7; margin-right: -30px'>"
for domain in more_domains: for domain in more_domains:
body += """ body += _(u"""
<a href='/%s' onclick='wrapper.gotoSite(this)' class='select'> <a href='/{domain}' onclick='wrapper.gotoSite(this)' class='select'>
<small style='float: right; margin-right: 40px; margin-top: -1px'>Register &raquo;</small>%s <small style='float: right; margin-right: 40px; margin-top: -1px'>{_[Register]} &raquo;</small>{domain}
</a> </a>
""" % (domain, domain) """)
body += "</div>" body += "</div>"
body += """ body += """
@ -687,13 +687,13 @@ class UiWebsocket(object):
new_site = site.clone(new_address, new_site_data["privatekey"], address_index=new_address_index) new_site = site.clone(new_address, new_site_data["privatekey"], address_index=new_address_index)
new_site.settings["own"] = True new_site.settings["own"] = True
new_site.saveSettings() new_site.saveSettings()
self.cmd("notification", ["done", "Site cloned<script>window.top.location = '/%s'</script>" % new_address]) self.cmd("notification", ["done", _["Site cloned"] + "<script>window.top.location = '/%s'</script>" % new_address])
gevent.spawn(new_site.announce) gevent.spawn(new_site.announce)
def actionSiteSetLimit(self, to, size_limit): def actionSiteSetLimit(self, to, size_limit):
self.site.settings["size_limit"] = int(size_limit) self.site.settings["size_limit"] = int(size_limit)
self.site.saveSettings() self.site.saveSettings()
self.response(to, "Site size limit changed to %sMB" % size_limit) self.response(to, _["Site size limit changed to {0}MB"].format(size_limit))
self.site.download(blind_includes=True) self.site.download(blind_includes=True)
def actionServerUpdate(self, to): def actionServerUpdate(self, to):