summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--js/quick-reply.js6
-rw-r--r--templates/main.js4
-rwxr-xr-xtools/i18n_compile.php4
3 files changed, 7 insertions, 7 deletions
diff --git a/js/quick-reply.js b/js/quick-reply.js
index bc36ca48..ea504b48 100644
--- a/js/quick-reply.js
+++ b/js/quick-reply.js
@@ -17,7 +17,7 @@ $(document).ready(function(){
return; // not index
txt_new_topic = $('form[name=post] input[type=submit]').val();
- txt_new_reply = txt_new_topic == 'Submit' ? txt_new_topic : new_reply_string;
+ txt_new_reply = txt_new_topic == _('Submit') ? txt_new_topic : new_reply_string;
undo_quick_reply = function() {
$('div.banner').remove();
@@ -27,9 +27,9 @@ $(document).ready(function(){
$('div.post.op').each(function() {
var id = $(this).children('p.intro').children('a.post_no:eq(1)').text();
- $('<a href="?/b/res/69.html">[Quick reply]</a>').insertAfter($(this).children('p.intro').children('a:last')).click(function() {
+ $('<a href="#">['+_("Quick reply")+']</a>').insertAfter($(this).children('p.intro').children('a:last')).click(function() {
$('div.banner').remove();
- $('<div class="banner">Posting mode: Replying to <small>&gt;&gt;' + id + '</small> <a class="unimportant" onclick="undo_quick_reply()" href="javascript:void(0)">[Return]</a></div>')
+ $('<div class="banner">'+fmt(_("Posting mode: Replying to <small>&gt;&gt;{0}</small>"), [id])+' <a class="unimportant" onclick="undo_quick_reply()" href="javascript:void(0)">['+_("Return")+']</a></div>')
.insertBefore('form[name=post]');
$('form[name=post] input[type=submit]').val(txt_new_reply);
diff --git a/templates/main.js b/templates/main.js
index b3e773a3..31c0254a 100644
--- a/templates/main.js
+++ b/templates/main.js
@@ -2,12 +2,12 @@
/* gettext-compatible _ function, example of usage:
*
- * > // Loading pl_PL.json here (containing polish translation strings generated by tools/locale_compile.php)
+ * > // Loading pl_PL.json here (containing polish translation strings generated by tools/i18n_compile.php)
* > alert(_("Hello!"));
* Witaj!
*/
function _(s) {
- return (typeof tb_l10n != 'undefined' && typeof tb_l10n[s] != 'undefined') ? tb_l10n[s] : s;
+ return (typeof l10n != 'undefined' && typeof l10n[s] != 'undefined') ? l10n[s] : s;
}
/* printf-like formatting function, example of usage:
diff --git a/tools/i18n_compile.php b/tools/i18n_compile.php
index c85ccb83..ce00051c 100755
--- a/tools/i18n_compile.php
+++ b/tools/i18n_compile.php
@@ -35,10 +35,10 @@ foreach ($locales as $loc) {
if (file_exists($locdir."/LC_MESSAGES/tinyboard.po")) $join = "-j";
else $join = "";
`cd $locdir/LC_MESSAGES;
- msgfmt tinyboard.po`;
+ msgfmt tinyboard.po -o tinyboard.mo`;
// Generate javascript.po
`cd tools/inc/lib/jsgettext/;
php po2json.php -i ../../../../$locdir/LC_MESSAGES/javascript.po \
- -o ../../../../$locdir/LC_MESSAGES/javascript.js -k tb_i18n`;
+ -o ../../../../$locdir/LC_MESSAGES/javascript.js`;
}