Skip to content

Commit

Permalink
Merge pull request #28 from opentechinstitute/internationalization
Browse files Browse the repository at this point in the history 
Internationalization tags added.
  • Loading branch information
@glamrock
glamrock committed Aug 27, 2013
2 parents 85b8f0e + 285e3b5 commit 573205e
Show file tree
Hide file tree
Showing 8 changed files with 30 additions and 27 deletions.
7 changes: 5 additions & 2 deletions usr/lib/lua/luci/controller/QS/QS.lua
View file
Expand Up @@ -6,10 +6,13 @@ require "luci.controller.QS.modules"

function index()
local uci = luci.model.uci.cursor()
luci.i18n.loadc("admin-core")
local i18n = luci.i18n.translate

if uci:get('quickstart', 'options', 'complete') ~= 'true' then
entry({"QuickStart"}, call("main"), "Quick Start").dependent=false
entry({"QuickStart"}, call("main"), "Quick Start", i18n("commotionquickstart")).dependent=false
end
entry({"admin", "commotion", "quickstart"}, call("resetQS"), "Restart Quickstart", 50)
entry({"admin", "commotion", "quickstart"}, call("resetQS"), "Restart Quickstart", i18n("commotionquickstart"), 50)

end

Expand Down
8 changes: 4 additions & 4 deletions usr/lib/lua/luci/view/QS/module/accessPoint.htm
View file
Expand Up @@ -7,11 +7,11 @@
<div id="zone-content-wrapper">
<div id="zone-content">
<input type="hidden" name="moduleName" value="accessPoint" />
<h2>Access Point Name</h2>
<p>What would you like to name your node's access point?</p>
<p>This is the name that users will see when they search for wireless access.</p>
<h2><%:Access Point Name%></h2>
<p><%:What would you like to name your node's access point?%></p>
<p><%:This is the name that users will see when they search for wireless access.%></p>
<h2 class="warning"><%=nameErr%></h2>
<p class="flavor">Choose a name that is 5-12 characters. You can use numbers, letters &amp; special characters. The name must be unique in the network. You can change the node name later by logging into the node administration page.</p>
<p class="flavor"><%:Choose a name that is 5-12 characters. You can use numbers, letters &amp; special characters. The name must be unique in the network. You can change the node name later by logging into the node administration page.%></p>
<input type="text" value="<%=pv.modules.accessPoint.name%>" name="accessPoint_nodeName">

</div>
Expand Down
6 changes: 3 additions & 3 deletions usr/lib/lua/luci/view/QS/module/adminPassword.htm
View file
Expand Up @@ -8,11 +8,11 @@
<div id="zone-content">
<input type="hidden" name="moduleName" value="adminPassword" />
<div class="cbi-value">
<label class="cbi-value-title tippable" data-tip="Choose a password that is between 9 and 30 characters. This password can be numbers, letters, and special characters.">Admin Password:</label>
<p>This password is used to access the administration menus on this device.</p>
<label class="cbi-value-title tippable" data-tip="<%:Choose a password that is between 9 and 30 characters. This password can be numbers, letters, and special characters.%>"><%:Admin Password:%></label>
<p><%:This password is used to access the administration menus on this device.%></p>
<h2 class="warning"><%=pwErr%></h2>
<input type="password" name="adminPassword_pwd1">
<p class="flavor">Retype your password here</p>
<p class="flavor"><%:Retype your password here%></p>
<input type="password" name="adminPassword_pwd2">
</div>
</div>
Expand Down
10 changes: 5 additions & 5 deletions usr/lib/lua/luci/view/QS/module/applyreboot.htm
View file
Expand Up @@ -61,21 +61,21 @@ <h2><a id="content" name="content"><%:System%> - <% if title then %><%=title%><%
<%:Waiting for changes to be applied...%>
<div id="zone-content-wrapper">
<div id="zone-content">
<h3>The name of your mesh network is:</h3>
<h3><%:The name of your mesh network is:%></h3>
<p><strong><%=meshName%></strong></p>

<h3>Your node name is:</h3>
<h3><%:Your node name is:%></h3>
<p><strong><%=nodeName%></strong></p>

<h3>When people connect to your node wirelessly, they will connect using this name:</h3>
<h3><%:When people connect to your node wirelessly, they will connect using this name:%></h3>
<p><strong><%=apName%></strong></p>

<p>After configuring your node, you can change the node name on the node administration page.</p>
<p><%:After configuring your node, you can change the node name on the node administration page.%></p>
</div>
</div>
</p>
<form action="<%=redirect_location%>" type="get">
<input type="submit" value="Click here if your browser doesn't redirect you within one minute" name="action" />
<input type="submit" value="<%:Click here if your browser doesn't redirect you within one minute%>" name="action" />
</form>
</fieldset>
</div>
Expand Down
14 changes: 7 additions & 7 deletions usr/lib/lua/luci/view/QS/module/name.htm
View file
Expand Up @@ -40,17 +40,17 @@ <h2 class="warning"><%=nameErr%></h2>
<div id="zone-content">
<input type="hidden" name="moduleName" value="name" />
<div class="cbi-value">
<label class="cbi-value-title tippable" data-tip="Choose a name that is 5-20 characters. You can use letters and numbers ONLY. The name will be made unique in the network through the addition of the bolded number next to the input box. You can change the node name later by logging into the node administration page.">Node Name</label>
<p>This value is used by other users and devices to find your network wirelessly and over the mesh. This value can be composed of letter, number and hyphens. (Hyphens can not be used at the beggining or end of the name.)</p>
<input type="text" placeholder="Your Node Name" name="nodeName">
<input type="checkbox" id="secureCheck" value="true" name="secure" onClick="toggleVisibility(this)"> Require a password for others to connect to your node.
<label class="cbi-value-title tippable" data-tip="<%:Choose a name that is 5-20 characters. You can use letters and numbers ONLY. The name will be made unique in the network through the addition of the bolded number next to the input box. You can change the node name later by logging into the node administration page.%>"><%:Node Name%></label>
<p><%:This value is used by other users and devices to find your network wirelessly and over the mesh. This value can be composed of letter, number and hyphens. (Hyphens can not be used at the beggining or end of the name.)%></p>
<input type="text" placeholder="<%:Your Node Name%>" name="nodeName">
<input type="checkbox" id="secureCheck" value="true" name="secure" onClick="toggleVisibility(this)"><%: Require a password for others to connect to your node.%>
</div>
<div id="secureAP" style="display:none">
<div class="cbi-value">
<label class="cbi-value-title tippable" data-tip="Choose a password that is between 9 and 30 characters. This password can be numbers, letters, and special characters.">WiFi Password</label>
<p class="flavor">This password is required for others to use your wifi.</p>
<label class="cbi-value-title tippable" data-tip="<%:Choose a password that is between 9 and 30 characters. This password can be numbers, letters, and special characters.%>"><%:WiFi Password%></label>
<p class="flavor"><%:This password is required for others to use your wifi.%></p>
<input type="password" name="pwd1">
<p class="flavor">Retype your password here</p>
<p class="flavor"><%:Retype your password here%></p>
<input type="password" name="pwd2">
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions usr/lib/lua/luci/view/QS/module/upload.htm
View file
Expand Up @@ -16,10 +16,10 @@
<input type="hidden" name="moduleName" value="upload">
<div class="error"><%=upErr%></div>
<div class="cbi-value">
<label class="cbi-value-title tippable" data-tip="Click on the field below to upload a file.">Upload <%=uploadTitle%></label>
<label class="cbi-value-title tippable" data-tip="<%:Click on the field below to upload a file.%>"><%:Upload%> <%=uploadTitle%></label>
<input type="file" name="<%=pv.modules.upload.fileType%>" id="media" />
<div class="upload-description">
Upload <%=pv.modules.upload.fileInstructions%>
<%:Upload%> <%=pv.modules.upload.fileInstructions%>
</div>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions usr/lib/lua/luci/view/QS/module/welcome.htm
View file
@@ -1,5 +1,5 @@
<input type="hidden" name="page" value="welcome" />

<p>Congratulations! You have a Commotion node and are ready to join a network or start a new one. This wizard will guide you through the setup. The setup process should take about 10 minutes.</p>
<p><%:Congratulations! You have a Commotion node and are ready to join a network or start a new one. This wizard will guide you through the setup. The setup process should take about 10 minutes.%></p>

<p>You can still change settings after setup is complete. </p>
<p><%:You can still change settings after setup is complete.%> </p>
4 changes: 2 additions & 2 deletions usr/lib/lua/luci/view/QS/reset.htm
View file
Expand Up @@ -19,8 +19,8 @@
<center>
<form method="post" action="<%=REQUEST_URI%>" enctype="multipart/form-data">
<div class="resetQS"><INPUT id="QSResetButton" type="submit" name="reset" value=" "></div>
<strong>Restart QuickStart</strong>
<strong><%:Restart QuickStart%></strong>
</form>
<p>If you would like to start the QuickStart configuration process over please click the above. WARNING: The quickstart process allows modification of this device by non-administrative users when it is active. Please make sure that you only restart the quickstart when you have time to finish the entire process.</p>
<p><%:If you would like to start the QuickStart configuration process over please click the above. WARNING: The quickstart process allows modification of this device by non-administrative users when it is active. Please make sure that you only restart the quickstart when you have time to finish the entire process.%></p>
</center>
<%+footer%>

0 comments on commit 573205e

Please sign in to comment.