From e639ec0be9d13449d66bbd5463400956b9d2853a Mon Sep 17 00:00:00 2001 From: Chris Ritzo Date: Fri, 2 Aug 2013 15:07:38 -0400 Subject: [PATCH 1/3] initial branch of commotion-quickstart with internationalization --- files/accessPoint.es.lmo | Bin 0 -> 488 bytes usr/lib/lua/luci/view/QS/module/accessPoint.htm | 8 ++++---- usr/lib/lua/luci/view/QS/module/adminPassword.htm | 6 +++--- usr/lib/lua/luci/view/QS/module/applyreboot.htm | 10 +++++----- usr/lib/lua/luci/view/QS/module/name.htm | 14 +++++++------- usr/lib/lua/luci/view/QS/module/upload.htm | 4 ++-- usr/lib/lua/luci/view/QS/module/welcome.htm | 4 ++-- usr/lib/lua/luci/view/QS/reset.htm | 4 ++-- 8 files changed, 25 insertions(+), 25 deletions(-) create mode 100644 files/accessPoint.es.lmo diff --git a/files/accessPoint.es.lmo b/files/accessPoint.es.lmo new file mode 100644 index 0000000000000000000000000000000000000000..3896351cd24874d9e073c2967ea17dcdde46e34b GIT binary patch literal 488 zcmYk3J4*yH6on%eBG_99a_tm$7Zq%_5z#GdeEkCNB$p*JlNpnV_$X~GEG#WV8PGz( zY6WE*#rzt7!M5J)LwDf9Av52(=VW&BEU^TNV9%Q}k77egaycw+9xMs*{kiYMGn52v z?@F}c6`??jU?PYXiV=nbj18RUw<>zA_gz|!adJTEfFd~d1Se!eWgyKRc<0e-7Sf|( zF!4^JfuW-|n1+hCX_+^Mu|zA?M+n}GJMxOP`pPOu&L>N<t~AgM8pVCyfeqJ%q
-

Access Point Name

-

What would you like to name your node's access point?

-

This is the name that users will see when they search for wireless access.

+

<%:Access Point Name%>

+

<%:What would you like to name your node's access point?%>

+

<%:This is the name that users will see when they search for wireless access.%>

<%=nameErr%>

-

Choose a name that is 5-12 characters. You can use numbers, letters & special characters. The name must be unique in the network. You can change the node name later by logging into the node administration page.

+

<%:Choose a name that is 5-12 characters. You can use numbers, letters & special characters. The name must be unique in the network. You can change the node name later by logging into the node administration page.%>

diff --git a/usr/lib/lua/luci/view/QS/module/adminPassword.htm b/usr/lib/lua/luci/view/QS/module/adminPassword.htm index d5bc099..eea31f8 100644 --- a/usr/lib/lua/luci/view/QS/module/adminPassword.htm +++ b/usr/lib/lua/luci/view/QS/module/adminPassword.htm @@ -8,11 +8,11 @@
- -

This password is used to access the administration menus on this device.

+ +

<%:This password is used to access the administration menus on this device.%>

<%=pwErr%>

-

Retype your password here

+

<%:Retype your password here%>

diff --git a/usr/lib/lua/luci/view/QS/module/applyreboot.htm b/usr/lib/lua/luci/view/QS/module/applyreboot.htm index 31f9e00..45c11a0 100644 --- a/usr/lib/lua/luci/view/QS/module/applyreboot.htm +++ b/usr/lib/lua/luci/view/QS/module/applyreboot.htm @@ -61,21 +61,21 @@

<%:System%> - <% if title then %><%=title%><% <%:Waiting for changes to be applied...%>
-

The name of your mesh network is:

+

<%:The name of your mesh network is:%>

<%=meshName%>

-

Your node name is:

+

<%:Your node name is:%>

<%=nodeName%>

-

When people connect to your node wirelessly, they will connect using this name:

+

<%:When people connect to your node wirelessly, they will connect using this name:%>

<%=apName%>

-

After configuring your node, you can change the node name on the node administration page.

+

<%:After configuring your node, you can change the node name on the node administration page.%>

- +
diff --git a/usr/lib/lua/luci/view/QS/module/name.htm b/usr/lib/lua/luci/view/QS/module/name.htm index 2aa9dc9..535968d 100644 --- a/usr/lib/lua/luci/view/QS/module/name.htm +++ b/usr/lib/lua/luci/view/QS/module/name.htm @@ -40,17 +40,17 @@

<%=nameErr%>

- -

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.)

- - Require a password for others to connect to your node. + +

<%: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.)%>

+ + <%: Require a password for others to connect to your node.%>
diff --git a/usr/lib/lua/luci/view/QS/module/upload.htm b/usr/lib/lua/luci/view/QS/module/upload.htm index 6c7038e..bd41561 100644 --- a/usr/lib/lua/luci/view/QS/module/upload.htm +++ b/usr/lib/lua/luci/view/QS/module/upload.htm @@ -16,10 +16,10 @@
<%=upErr%>
- +
- Upload <%=pv.modules.upload.fileInstructions%> + <%:Upload%> <%=pv.modules.upload.fileInstructions%>
diff --git a/usr/lib/lua/luci/view/QS/module/welcome.htm b/usr/lib/lua/luci/view/QS/module/welcome.htm index c28d54c..3c4ab84 100644 --- a/usr/lib/lua/luci/view/QS/module/welcome.htm +++ b/usr/lib/lua/luci/view/QS/module/welcome.htm @@ -1,5 +1,5 @@ -

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.

+

<%: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.%>

-

You can still change settings after setup is complete.

+

<%:You can still change settings after setup is complete.%>

diff --git a/usr/lib/lua/luci/view/QS/reset.htm b/usr/lib/lua/luci/view/QS/reset.htm index d2b8dc5..d4970f9 100644 --- a/usr/lib/lua/luci/view/QS/reset.htm +++ b/usr/lib/lua/luci/view/QS/reset.htm @@ -19,8 +19,8 @@
-Restart QuickStart +<%:Restart QuickStart%>
-

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.

+

<%: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.%>

<%+footer%> From c7c91f4ca94850b8a0702abec1e2ef90b4141e2a Mon Sep 17 00:00:00 2001 From: Chris Ritzo Date: Fri, 9 Aug 2013 15:15:53 -0400 Subject: [PATCH 2/3] Added test functions to controller file to enable (hopefully) i18n localization. --- usr/lib/lua/luci/controller/QS/QS.lua | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/usr/lib/lua/luci/controller/QS/QS.lua b/usr/lib/lua/luci/controller/QS/QS.lua index 55f02ad..3cdaa03 100644 --- a/usr/lib/lua/luci/controller/QS/QS.lua +++ b/usr/lib/lua/luci/controller/QS/QS.lua @@ -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 From 285e3b54c9d93b49405e63015c9ed64ff23f2119 Mon Sep 17 00:00:00 2001 From: Chris Ritzo Date: Mon, 26 Aug 2013 10:17:24 -0400 Subject: [PATCH 3/3] deleted: accessPoint.es.lmo --- files/accessPoint.es.lmo | Bin 488 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 files/accessPoint.es.lmo diff --git a/files/accessPoint.es.lmo b/files/accessPoint.es.lmo deleted file mode 100644 index 3896351cd24874d9e073c2967ea17dcdde46e34b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 488 zcmYk3J4*yH6on%eBG_99a_tm$7Zq%_5z#GdeEkCNB$p*JlNpnV_$X~GEG#WV8PGz( zY6WE*#rzt7!M5J)LwDf9Av52(=VW&BEU^TNV9%Q}k77egaycw+9xMs*{kiYMGn52v z?@F}c6`??jU?PYXiV=nbj18RUw<>zA_gz|!adJTEfFd~d1Se!eWgyKRc<0e-7Sf|( zF!4^JfuW-|n1+hCX_+^Mu|zA?M+n}GJMxOP`pPOu&L>N<t~AgM8pVCyfeqJ%q