diff options
Diffstat (limited to 'modules/luci-base')
-rw-r--r-- | modules/luci-base/htdocs/luci-static/resources/cbi.js | 13 | ||||
-rw-r--r-- | modules/luci-base/luasrc/view/cbi/apply_widget.htm | 1 | ||||
-rw-r--r-- | modules/luci-base/luasrc/view/cbi/header.htm | 25 | ||||
-rw-r--r-- | modules/luci-base/luasrc/view/cbi/simpleform.htm | 1 | ||||
-rw-r--r-- | modules/luci-base/po/ja/base.po | 59 | ||||
-rw-r--r-- | modules/luci-base/po/pl/base.po | 18 |
6 files changed, 49 insertions, 68 deletions
diff --git a/modules/luci-base/htdocs/luci-static/resources/cbi.js b/modules/luci-base/htdocs/luci-static/resources/cbi.js index 6a487366f8..ddbff83418 100644 --- a/modules/luci-base/htdocs/luci-static/resources/cbi.js +++ b/modules/luci-base/htdocs/luci-static/resources/cbi.js @@ -1498,6 +1498,15 @@ String.nobr = function() return ''.nobr.apply(arguments[0], a); } +if (window.NodeList && !NodeList.prototype.forEach) { + NodeList.prototype.forEach = function (callback, thisArg) { + thisArg = thisArg || window; + for (var i = 0; i < this.length; i++) { + callback.call(thisArg, this[i], i, this); + } + }; +} + var dummyElem, domParser; @@ -2072,10 +2081,10 @@ function cbi_update_table(table, data, placeholder) { var trow = E('div', { 'class': 'tr' }); for (var i = 0; i < titles.length; i++) { - var text = titles[i].innerText; + var text = (titles[i].innerText || '').trim(); var td = trow.appendChild(E('div', { 'class': titles[i].className, - 'data-title': text ? text.trim() : null + 'data-title': (text !== '') ? text : null }, row[i] || '')); td.classList.remove('th'); diff --git a/modules/luci-base/luasrc/view/cbi/apply_widget.htm b/modules/luci-base/luasrc/view/cbi/apply_widget.htm index e3090da656..3d98085f86 100644 --- a/modules/luci-base/luasrc/view/cbi/apply_widget.htm +++ b/modules/luci-base/luasrc/view/cbi/apply_widget.htm @@ -47,7 +47,6 @@ } </style> -<script type="text/javascript" src="<%=resource%>/cbi.js"></script> <script type="text/javascript">//<![CDATA[ var xhr = new XHR(), uci_apply_auth = { sid: '<%=luci.dispatcher.context.authsession%>', token: '<%=token%>' }, diff --git a/modules/luci-base/luasrc/view/cbi/header.htm b/modules/luci-base/luasrc/view/cbi/header.htm index 9710bae8f4..821fa3efae 100644 --- a/modules/luci-base/luasrc/view/cbi/header.htm +++ b/modules/luci-base/luasrc/view/cbi/header.htm @@ -1,18 +1,17 @@ <%+header%> -<form method="post" name="cbi" action="<%=REQUEST_URI%>" enctype="multipart/form-data" onreset="return cbi_validate_reset(this)" onsubmit="return cbi_validate_form(this, '<%:Some fields are invalid, cannot save values!%>')"> +<form method="post" name="cbi" action="<%=REQUEST_URI%>" enctype="multipart/form-data" onreset="return cbi_validate_reset(this)" onsubmit="return cbi_validate_form(this, '<%:Some fields are invalid, cannot save values!%>')"<%= + attr("data-strings", luci.util.serialize_json({ + label = { + choose = translate('-- Please choose --'), + custom = translate('-- custom --'), + }, + path = { + resource = resource, + browser = url("admin/filebrowser") + } + })) +%>> <div> - <script type="text/javascript" src="<%=resource%>/cbi.js"<%= - attr("data-strings", luci.util.serialize_json({ - label = { - choose = translate('-- Please choose --'), - custom = translate('-- custom --'), - }, - path = { - resource = resource, - browser = url("admin/filebrowser") - } - })) - %>></script> <input type="hidden" name="token" value="<%=token%>" /> <input type="hidden" name="cbi.submit" value="1" /> <input type="submit" value="<%:Save%>" class="hidden" /> diff --git a/modules/luci-base/luasrc/view/cbi/simpleform.htm b/modules/luci-base/luasrc/view/cbi/simpleform.htm index c6000d22b3..5069e9f407 100644 --- a/modules/luci-base/luasrc/view/cbi/simpleform.htm +++ b/modules/luci-base/luasrc/view/cbi/simpleform.htm @@ -1,7 +1,6 @@ <% if not self.embedded then %> <form method="post" enctype="multipart/form-data" action="<%=REQUEST_URI%>"> <div> - <script type="text/javascript" src="<%=resource%>/cbi.js"></script> <input type="hidden" name="token" value="<%=token%>" /> <input type="hidden" name="cbi.submit" value="1" /> </div> diff --git a/modules/luci-base/po/ja/base.po b/modules/luci-base/po/ja/base.po index 90833aada0..2cefb817a3 100644 --- a/modules/luci-base/po/ja/base.po +++ b/modules/luci-base/po/ja/base.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-06-10 03:40+0200\n" -"PO-Revision-Date: 2018-06-01 02:42+0900\n" +"PO-Revision-Date: 2018-07-07 17:55+0900\n" "Last-Translator: INAGAKI Hiroshi <musashino.open@gmail.com>\n" "Language: ja\n" "MIME-Version: 1.0\n" @@ -50,7 +50,7 @@ msgid "-- match by uuid --" msgstr "-- UUID を指定 --" msgid "-- please select --" -msgstr "" +msgstr "-- 選択してください --" msgid "1 Minute Load:" msgstr "過去1分の負荷:" @@ -888,7 +888,7 @@ msgid "Device unreachable!" msgstr "デバイスに到達できません" msgid "Device unreachable! Still waiting for device..." -msgstr "" +msgstr "デバイスに到達できません!まだデバイスを待っています..." msgid "Diagnostics" msgstr "診断機能" @@ -980,7 +980,7 @@ msgstr "" "Name System\">DNS</abbr>リクエストを転送しません" msgid "Down" -msgstr "" +msgstr "下へ" msgid "Download and install package" msgstr "パッケージのダウンロードとインストール" @@ -2080,10 +2080,10 @@ msgid "Mounted file systems" msgstr "マウント中のファイルシステム" msgid "Move down" -msgstr "下へ" +msgstr "下へ移動" msgid "Move up" -msgstr "上へ" +msgstr "上へ移動" msgid "Multicast address" msgstr "マルチキャスト アドレス" @@ -2650,6 +2650,10 @@ msgid "" "Really delete this interface? The deletion cannot be undone! You might lose " "access to this device if you are connected via this interface" msgstr "" +"本当にこのインターフェースを削除しますか?一度削除すると、元に戻すことはでき" +"ません!\n" +"もしこのインターフェースを経由して接続している場合、このデバイスにアクセスで" +"きなくなる場合があります" msgid "" "Really delete this wireless network? The deletion cannot be undone! You " @@ -2667,6 +2671,9 @@ msgid "" "Really shut down network? You might lose access to this device if you are " "connected via this interface" msgstr "" +"本当にネットワークを停止しますか?\n" +"このネットワークを経由して接続している場合、デバイスにアクセスできなくなる場" +"合があります" msgid "" "Really shutdown interface \"%s\"? You might lose access to this device if " @@ -3126,6 +3133,8 @@ msgstr "スイッチ %q (%s)" msgid "" "Switch %q has an unknown topology - the VLAN settings might not be accurate." msgstr "" +"スイッチ %q は不明なトポロジを持っています - VLAN 設定は正確ではないかもしれ" +"ません。" msgid "Switch Port Mask" msgstr "スイッチポート マスク" @@ -3551,7 +3560,7 @@ msgid "Unsupported protocol type." msgstr "サポートされていないプロトコルタイプ" msgid "Up" -msgstr "" +msgstr "上へ" msgid "Update lists" msgstr "リストの更新" @@ -3821,7 +3830,7 @@ msgid "bridged" msgstr "ブリッジ" msgid "create" -msgstr "" +msgstr "作成" msgid "create:" msgstr "作成:" @@ -3852,7 +3861,7 @@ msgstr "" "録するファイル" msgid "forward" -msgstr "" +msgstr "転送" msgid "full-duplex" msgstr "全二重" @@ -3961,35 +3970,3 @@ msgstr "はい" msgid "« Back" msgstr "« 戻る" - -#~ msgid "Device unreachableX" -#~ msgstr "デバイスに到達できません!" - -#~ msgid "DHCP Leases" -#~ msgstr "DHCPリース" - -#~ msgid "DHCPv6 Leases" -#~ msgstr "DHCPv6 リース" - -#~ msgid "" -#~ "Really delete this interface? The deletion cannot be undone! You might " -#~ "lose access to this device if you are connected via this interface." -#~ msgstr "" -#~ "本当にこのインターフェースを削除しますか?一度削除すると、元に戻すことはで" -#~ "きません!\n" -#~ "このインターフェースを経由して接続している場合、デバイスにアクセスできなく" -#~ "なる場合があります。" - -#~ msgid "" -#~ "Really shut down network? You might lose access to this device if you are " -#~ "connected via this interface." -#~ msgstr "" -#~ "本当にネットワークを停止しますか?\n" -#~ "このネットワークを経由して接続している場合、デバイスにアクセスできなくなる" -#~ "場合があります。" - -#~ msgid "Sort" -#~ msgstr "ソート" - -#~ msgid "help" -#~ msgstr "ヘルプ" diff --git a/modules/luci-base/po/pl/base.po b/modules/luci-base/po/pl/base.po index c9ea03dd5e..7d2e006cd1 100644 --- a/modules/luci-base/po/pl/base.po +++ b/modules/luci-base/po/pl/base.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: LuCI\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-20 09:40+0200\n" -"PO-Revision-Date: 2018-06-10 10:05+0200\n" +"PO-Revision-Date: 2018-07-7 14:05+0200\n" "Last-Translator: Rixerx <krystian.kozak20@gmail.com>\n" "Language-Team: Polish\n" "Language: pl\n" @@ -511,15 +511,14 @@ msgstr "Wróć do przeglądu" msgid "Back to scan results" msgstr "Wróć do wyników skanowania" -# NIe ma powodu skracać tekstu, zmieści się w polu. msgid "Backup" msgstr "Kopia zapasowa" msgid "Backup / Flash Firmware" -msgstr "Kopia zapasowa/aktualizacja firmware" +msgstr "Kopia zapasowa / aktualizacja firmware" msgid "Backup file list" -msgstr "Kopia zapas. listy plików" +msgstr "Kopia zapasowa listy plików" msgid "Bad address specified!" msgstr "Wprowadzono zły adres" @@ -654,7 +653,7 @@ msgid "" "Click \"Generate archive\" to download a tar archive of the current " "configuration files." msgstr "" -"Wciśnij \"Twórz archiwum\" aby pobrać archiwum tar zawierające bieżące pliki " +"Kliknij \"Twórz archiwum\" aby pobrać archiwum tar zawierające bieżące pliki " "konfiguracyjne." msgid "Client" @@ -892,10 +891,10 @@ msgid "Device is rebooting..." msgstr "Urządzenie jest uruchamiane ponownie ..." msgid "Device unreachable!" -msgstr "Urządzenie nieosiągalne" +msgstr "Urządzenie nieosiągalne!" msgid "Device unreachable! Still waiting for device..." -msgstr "" +msgstr "Urządzenie nieosiągalne! Wciąż czekam na urządzenie..." msgid "Diagnostics" msgstr "Diagnostyka" @@ -2566,7 +2565,7 @@ msgid "Prevent listening on these interfaces." msgstr "Zapobiegaj nasłuchiwaniu na tych interfejsach." msgid "Prevents client-to-client communication" -msgstr "Zabroń klientą na komunikacje między sobą" +msgstr "Zapobiega na komunikacje między klientami" msgid "Prism2/2.5/3 802.11b Wireless Controller" msgstr "Kontroler bezprzewodowy Prism2/2.5/3 802.11b" @@ -2832,7 +2831,6 @@ msgstr "Uruchom ponownie" msgid "Restart Firewall" msgstr "Uruchom ponownie firewalla" -# NIe ma powodu skracać tekstu, zmieści się w polu. msgid "Restore" msgstr "Przywróć" @@ -3254,7 +3252,7 @@ msgstr "" "oraz <code>_</code>" msgid "The backup archive does not appear to be a valid gzip file." -msgstr "" +msgstr "Archiwum kopii zapasowej nie wygląda na prawidłowe." msgid "The configuration file could not be loaded due to the following error:" msgstr "" |