Translation for jQuery.divgrow strings. Fix mismatch in jQuery.timeago strings

3 files changed, 27 insertions, 23 deletions

diff --git a/include/js_strings.php b/include/js_strings.php
index afa8f075a..2d96ca9d2 100644
--- a/include/js_strings.php
+++ b/include/js_strings.php
@@ -2,18 +2,20 @@
 
 function js_strings() {
 	return replace_macros(get_markup_template('js_strings.tpl'), array(
-		'$delitem'    => t('Delete this item?'),
-		'$comment'    => t('Comment'),
-		'$showmore'   => t('show more'),
-		'$showfewer'  => t('show fewer'),
-		'$pwshort'    => t("Password too short"),
-		'$pwnomatch'  => t("Passwords do not match"),
-		'$everybody'  => t('everybody'),
-		'$passphrase' => t('Secret Passphrase'),
-		'$passhint'   => t('Passphrase hint'),
+		'$delitem'     => t('Delete this item?'),
+		'$comment'     => t('Comment'),
+		'$showmore'    => t('show more'),
+		'$showfewer'   => t('show fewer'),
+		'$divgrowmore' => t('+ Show More'),
+		'$divgrowless' => t('- Show Less'),
+		'$pwshort'     => t("Password too short"),
+		'$pwnomatch'   => t("Passwords do not match"),
+		'$everybody'   => t('everybody'),
+		'$passphrase'  => t('Secret Passphrase'),
+		'$passhint'    => t('Passphrase hint'),
 
 		'$t01' => ((t('timeago.prefixAgo') != 'timeago.prefixAgo') ? t('timeago.prefixAgo') : 'null'),
-		'$t02' => ((t('timeago.suffixAgo') != 'timeago.suffixAgo') ? t('timeago.suffixAgo') : 'null'),
+		'$t02' => ((t('timeago.prefixFromNow') != 'timeago.prefixFromNow') ? t('timeago.prefixFromNow') : 'null'),
 		'$t03' => t('ago'),
 		'$t04' => t('from now'),
 		'$t05' => t('less than a minute'),
@@ -32,4 +34,4 @@ function js_strings() {
 
 
 	));
-}
\ No newline at end of file
+}
diff --git a/view/js/main.js b/view/js/main.js
index fa96596f4..5f88ea9ca 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -535,7 +535,7 @@ function updateConvItems(mode,data) {
 		$(".wall-item-body").each(function() {
 				if($(this).height() > 410) {
 				if(! $(this).hasClass('divmore')) {
-					$(this).divgrow({ initialHeight: 400, showBrackets: false });
+					$(this).divgrow({ initialHeight: 400, moreText: aStr['divgrowmore'], lessText: aStr['divgrowless'], showBrackets: false });
 					$(this).addClass('divmore');
 				}
 			}					
diff --git a/view/tpl/js_strings.tpl b/view/tpl/js_strings.tpl
index 9eb552767..cb0e8d24a 100755
--- a/view/tpl/js_strings.tpl
+++ b/view/tpl/js_strings.tpl
@@ -2,18 +2,20 @@
 
 	var aStr = {
 
-		'delitem'    : "{{$delitem}}",
-		'comment'    : "{{$comment}}",
-		'showmore'   : "{{$showmore}}",
-		'showfewer'  : "{{$showfewer}}",
-		'pwshort'    : "{{$pwshort}}",
-		'pwnomatch'  : "{{$pwnomatch}}",
-		'everybody'  : "{{$everybody}}",
-		'passphrase' : "{{$passphrase}}",
-		'passhint'   : "{{$passhint}}",
+		'delitem'     : "{{$delitem}}",
+		'comment'     : "{{$comment}}",
+		'showmore'    : "{{$showmore}}",
+		'showfewer'   : "{{$showfewer}}",
+		'divgrowmore' : "{{$divshowmore}}",
+		'divgrowless' : "{{$divshowless}}",
+		'pwshort'     : "{{$pwshort}}",
+		'pwnomatch'   : "{{$pwnomatch}}",
+		'everybody'   : "{{$everybody}}",
+		'passphrase'  : "{{$passphrase}}",
+		'passhint'    : "{{$passhint}}",
 
-		't01' :  {{$t01}},
-		't02' :  {{$t02}},
+		't01' : "{{$t01}}",
+		't02' : "{{$t02}}",
 		't03' : "{{$t03}}",
 		't04' : "{{$t04}}",
 		't05' : "{{$t05}}",