zzz/muwire
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prep for push to transifex

Browse Source 
Additional string cleanup, regenerate English po file
This commit is contained in:
zzz
2020-05-13 10:29:18 -04:00
parent c1324c92ba
commit f1a2b103a8
7 changed files with 1110 additions and 442 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1503
webui/locale/messages_en.po
View File

File diff suppressed because it is too large Load Diff

4
webui/src/main/java/com/muwire/webui/BrowseServlet.java
View File

@ -133,14 +133,14 @@ public class BrowseServlet extends HttpServlet {
if (action.equals("browse")) {
String personaB64 = req.getParameter("host");
if (personaB64 == null) {
resp.sendError(403,Util._t("Please enter a full MuWire id"));
resp.sendError(403,Util._t("Please enter a full MuWire ID"));
return;
}
Persona host;
try {
host = new Persona(new ByteArrayInputStream(Base64.decode(personaB64)));
} catch (Exception bad) {
resp.sendError(403,Util._t("Please enter a full MuWire id"));
resp.sendError(403,Util._t("Please enter a full MuWire ID"));
return;
}
browseManager.browse(host);

4
webui/src/main/java/com/muwire/webui/FeedServlet.java
View File

@ -112,14 +112,14 @@ public class FeedServlet extends HttpServlet {
if (action.equals("subscribe")) {
String personaB64 = req.getParameter("host");
if (personaB64 == null) {
resp.sendError(403, Util._t("Please enter a full MuWire id"));
resp.sendError(403, Util._t("Please enter a full MuWire ID"));
return;
}
Persona host;
try {
host = new Persona(new ByteArrayInputStream(Base64.decode(personaB64)));
} catch (Exception bad) {
resp.sendError(403, Util._t("Please enter a full MuWire id"));
resp.sendError(403, Util._t("Please enter a full MuWire ID"));
return;
}
feedManager.subscribe(host);

5
webui/src/main/java/com/muwire/webui/Util.java
View File

@ -33,7 +33,6 @@ public class Util {
_x("About Me"),
_x("Actions"),
_x("Active Sources"),
_x("Auto-watch directory for changes using operating system"),
_x("Browse"),
_x("Browsing"),
_x("Cancel"),
@ -59,7 +58,6 @@ public class Util {
_x("Downloaded Pieces"),
_x("Downloader"),
_x("Downloading"),
_x("Enter a full MuWire id"),
_x("Enter Reason (Optional)"),
_x("ETA"),
_x("Failing Hosts"),
@ -85,6 +83,7 @@ public class Util {
_x("Mark Distrusted"),
_x("Mark Neutral"),
_x("Mark Trusted"),
_x("Monitor directory for changes"),
_x("MuWire Status"),
_x("must be greater than zero"),
_x("Name"),
@ -143,8 +142,6 @@ public class Util {
_x("User"),
_x("View 1 Certificate"),
_x("View {0} Certificates"),
_x("Your full MuWire id is"),
_x("Your short MuWire id is {0}"),
_x("Your Trust"),
_x("{0}% of piece")
};

2
webui/src/main/js/advancedSharing.js
View File

@ -104,7 +104,7 @@ function configure(path) {
html += "<table>"
html += "<tr>"
html += "<td>" + _t("Auto-watch directory for changes using operating system") + "</td>"
html += "<td>" + _t("Monitor directory for changes") + "</td>"
html += "<td><p align='right'><input type='checkbox' name='autoWatch' value='true'"
if (dir.autoWatch == "true")
html += " checked "

32
webui/src/main/webapp/ConfigurationPage.jsp
View File

@ -57,7 +57,7 @@ Exception error = (Exception) application.getAttribute("MWConfigError");
<tr>
<td>
<div class="tooltip"><%=Util._t("Allow browsing")%>
<span class="tooltiptext"><%=Util._t("Allow other MuWire users to browse your shared files?")%></span>
<span class="tooltiptext"><%=Util._t("Allow other users to browse your shared files")%></span>
</div>
</td>
<td><p align="right"><input type="checkbox" <% if (core.getMuOptions().getBrowseFiles()) out.write("checked"); %> name="browseFiles" value="true"></p></td>
@ -65,7 +65,7 @@ Exception error = (Exception) application.getAttribute("MWConfigError");
<tr>
<td>
<div class="tooltip"><%=Util._t("Allow tracking")%>
<span class="tooltiptext"><%=Util._t("Allow trackers to track your shared files?")%></span>
<span class="tooltiptext"><%=Util._t("Allow trackers to track your shared files")%></span>
</div>
</td>
<td><p align="right"><input type="checkbox" <% if (core.getMuOptions().getAllowTracking()) out.write("checked"); %> name="allowTracking" value="true"></p></td>
@ -84,7 +84,7 @@ Exception error = (Exception) application.getAttribute("MWConfigError");
</tr>
<tr>
<td><div class="tooltip"><%=Util._t("Directory for downloaded files")%>
<span class="tooltiptext"><%=Util._t("Where to save downloaded files. MuWire must be able to write to this location")%></span>
<span class="tooltiptext"><%=Util._t("Where to save downloaded files. MuWire must be able to write to this location.")%></span>
</div>
</td>
<td><p align="right"><input type="text" size="30" name="downloadLocation" value="<%= core.getMuOptions().getDownloadLocation().getAbsoluteFile()%>"></p></td>
@ -103,14 +103,14 @@ Exception error = (Exception) application.getAttribute("MWConfigError");
<table>
<tr>
<td><div class="tooltip"><%=Util._t("Total upload slots (-1 means unlimited)")%>
<span class="tooltiptext"><%=Util._t("How many files at most should MuWire upload at the same time")%></span>
<span class="tooltiptext"><%=Util._t("Maximum files to upload at once")%></span>
</div>
</td>
<td><p align="right"><input type="text" size="1" name="totalUploadSlots" class="right" value="<%= core.getMuOptions().getTotalUploadSlots() %>"></p></td>
</tr>
<tr>
<td><div class="tooltip"><%=Util._t("Upload slots per user (-1 means unlimited)")%>
<span class="tooltiptext"><%=Util._t("How many files should MuWire upload to any given user at the same time")%></span>
<span class="tooltiptext"><%=Util._t("Maximum files to upload to a single user at once")%></span>
</div>
</td>
<td><p align="right"><input type="text" size="1" name="uploadSlotsPerUser" class="right" value="<%= core.getMuOptions().getUploadSlotsPerUser() %>"></p></td>
@ -122,14 +122,14 @@ Exception error = (Exception) application.getAttribute("MWConfigError");
<table>
<tr>
<td><div class="tooltip"><%=Util._t("Share downloaded files")%>
<span class="tooltiptext"><%=Util._t("Whether to automatically share files which you have downloaded with MuWire")%></span>
<span class="tooltiptext"><%=Util._t("Automatically share files you have downloaded with MuWire")%></span>
</div>
</td>
<td><p align="right"><input type="checkbox" <% if (core.getMuOptions().getShareDownloadedFiles()) out.write("checked"); %> name="shareDownloadedFiles" value="true"></p></td>
</tr>
<tr>
<td><div class="tooltip"><%=Util._t("Share hidden files")%>
<span class="tooltiptext"><%=Util._t("Should MuWire share files marked as Hidden by the operating system?")%></span>
<span class="tooltiptext"><%=Util._t("Share files marked as hidden by the operating system")%></span>
</div>
</td>
<td><p align="right"><input type="checkbox" <% if (core.getMuOptions().getShareHiddenFiles()) out.write("checked"); %> name="shareHiddenFiles" value="true"></p></td>
@ -141,20 +141,20 @@ Exception error = (Exception) application.getAttribute("MWConfigError");
<table>
<tr>
<td><div class="tooltip"><%=Util._t("Enable my feed")%>
<span class="tooltiptext"><%=Util._t("Enable your personal file feed?")%></span></div>
<span class="tooltiptext"><%=Util._t("Enable your personal file feed")%></span></div>
</td>
<td><p align="right"><input type="checkbox" <% if (core.getMuOptions().getFileFeed()) out.write("checked"); %> name="fileFeed" value="true"></p></td>
</tr>
<tr>
<td><div class="tooltip"><%=Util._t("Advertise my feed in search results")%>
<span class="tooltiptext"><%=Util._t("If this is enabled MuWire will let other users know about your personal file feed")%></span>
<span class="tooltiptext"><%=Util._t("Allow other users to find your personal file feed")%></span>
</div>
</td>
<td><p align="right"><input type="checkbox" <% if (core.getMuOptions().getAdvertiseFeed()) out.write("checked"); %> name="advertiseFeed" value="true"></p></td>
</tr>
<tr>
<td><div class="tooltip"><%=Util._t("Publish shared files automatically")%>
<span class="tooltiptext"><%=Util._t("If enabled, all files you share in the future will be published to your feed automatically.")%></span>
<span class="tooltiptext"><%=Util._t("All files you share in the future will be published to your feed automatically.")%></span>
</div>
</td>
<td><p align="right"><input type="checkbox" <% if (core.getMuOptions().getAutoPublishSharedFiles()) out.write("checked"); %> name="autoPublishSharedFiles" value="true"></p></td>
@ -166,14 +166,14 @@ Exception error = (Exception) application.getAttribute("MWConfigError");
<table>
<tr>
<td><div class="tooltip"><%=Util._t("Download published files automatically")%>
<span class="tooltiptext"><%=Util._t("If enabled, MuWire will download every file published to the given feed")%></span>
<span class="tooltiptext"><%=Util._t("Download every file published to the given feed")%></span>
</div>
</td>
<td><p align="right"><input type="checkbox" <% if (core.getMuOptions().getDefaultFeedAutoDownload()) out.write("checked"); %> name="defaultFeedAutoDownload" value="true"></p></td>
</tr>
<tr>
<td><div class="tooltip"><%=Util._t("Download each file sequentially")%>
<span class="tooltiptext"><%=Util._t("Whether to download files from this feed sequentially. This helps with previewing media files, but may reduce availability of the file for others.")%></span>
<span class="tooltiptext"><%=Util._t("Download files from this feed sequentially. This helps with previewing media files, but may reduce availability of the file for others.")%></span>
</div>
</td>
@ -188,7 +188,7 @@ Exception error = (Exception) application.getAttribute("MWConfigError");
</tr>
<tr>
<td><div class="tooltip"><%=Util._t("Number of items to keep on disk (-1 means unlimited)")%>
<span class="tooltiptext"><%=Util._t("MuWire will only remember this many published items across restarts, unless you set the value to -1")%></span>
<span class="tooltiptext"><%=Util._t("Only remember this many published items across restarts, unless you set the value to -1")%></span>
</div>
</td>
<td><p align="right"><input type="text" size="1" name="defaultFeedItemsToKeep" class="right" value="<%= core.getMuOptions().getDefaultFeedItemsToKeep() %>"></p></td>
@ -200,21 +200,21 @@ Exception error = (Exception) application.getAttribute("MWConfigError");
<table>
<tr>
<td><div class="tooltip"><%=Util._t("Allow only trusted connections")%>
<span class="tooltiptext"><%=Util._t("If enabled, MuWire will only connect to users you have marked as Trusted")%></span>
<span class="tooltiptext"><%=Util._t("Only connect to users you have marked as Trusted")%></span>
</div>
</td>
<td><p align="right"><input type="checkbox" <% if (!core.getMuOptions().getAllowUntrusted()) out.write("checked"); %> name="allowUntrusted" value="true"></p></td>
</tr>
<tr>
<td><div class="tooltip"><%=Util._t("Search extra hop")%>
<span class="tooltiptext"><%=Util._t("If only trusted connections are allowed, MuWire will search only users that are directly connected to you. Use this setting to search further out. It has no effect if untrusted connections are allowed")%></span>
<span class="tooltiptext"><%=Util._t("If only trusted connections are allowed, search only users that are directly connected to you. Use this setting to enable searches of additional users. It has no effect if untrusted connections are allowed.")%></span>
</div>
</td>
<td><p align="right"><input type="checkbox" <% if (core.getMuOptions().getSearchExtraHop()) out.write("checked"); %> name="searchExtraHop" value="true"></p></td>
</tr>
<tr>
<td><div class="tooltip"><%=Util._t("Allow others to view my trust list")%>
<span class="tooltiptext"><%=Util._t("Whether to allow other MuWire users to see who you have marked as Trusted and Distrusted")%></span>
<span class="tooltiptext"><%=Util._t("Allow other MuWire users to see who you have marked as Trusted and Distrusted")%></span>
</div>
</td>
<td><p align="right"><input type="checkbox" <% if (core.getMuOptions().getAllowTrustLists()) out.write("checked"); %> name="allowTrustLists" value="true"></p></td>

2
webui/src/main/webapp/Feeds.jsp
View File

@ -25,7 +25,7 @@ String helptext = Util._t("Every MuWire user can have a file feed to publish sha
<aside>
<div class="menubox-divider"></div>
<div class="menubox">
<h2><%=Util._t("Enter a full MuWire id")%></h2>
<h2><%=Util._t("Enter a full MuWire ID")%></h2>
<form action="/MuWire/Feed" method="post">
<input type="text" name="host">
<input type="hidden" name="action" value="subscribe">