[livejournal] r19319: LJSUP-9117: Expand S2

U   trunk/bin/upgrading/s2layers/generator/layout.s2
U   trunk/bin/upgrading/s2layers/i18nc/ru1.s2

Modified: trunk/bin/upgrading/s2layers/generator/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/generator/layout.s2	2011-06-20 02:18:04 UTC (rev 19318)
+++ trunk/bin/upgrading/s2layers/generator/layout.s2	2011-06-20 03:41:11 UTC (rev 19319)
@@ -1357,7 +1357,7 @@
     var string poster = isnull $c.poster ? $*text_poster_anonymous : $c.poster->as_string();
 
     print safe """<a href="$c.permalink_url">$subject</a> $poster""";
-    $c->print_expand_collapse_links();
+    " (";$c->print_expand_collapse_links(); ")";
 }
 function EntryPage::print_comment_full (Comment c) {
     var Page p = get_page();
@@ -1449,7 +1449,9 @@
     if ($c.parent_url != "") { "(<a href='$c.parent_url'>Parent</a>) "; }
     if ($c.thread_url != "" and (not $c.spam)) {
         "(<a href='$c.thread_url'>Thread</a>) ";
-        $c->print_expand_collapse_links();
+        if ($c.parent_url != "" and size $c.replies > 0) {
+            "("; $c->print_expand_collapse_links(); ")";
+        }
     }
     if (not $c.frozen) {
         $c->print_reply_container({"class" => "quickreply"});

Modified: trunk/bin/upgrading/s2layers/i18nc/ru1.s2
===================================================================
--- trunk/bin/upgrading/s2layers/i18nc/ru1.s2	2011-06-20 02:18:04 UTC (rev 19318)
+++ trunk/bin/upgrading/s2layers/i18nc/ru1.s2	2011-06-20 03:41:11 UTC (rev 19319)
@@ -70,13 +70,13 @@
 set text_nosubject = "(без темы)";
 set text_noentries_recent = "Записей нет";
 set text_noentries_day = "За этот день записей нет";
-set text_permalink = "ссылка";
-set text_edit_entry = "редактировать запись";
-set text_edit_tags = "редактировать метки";
-set text_tell_friend = "рассказать другу";
-set text_mem_add = "в избранное";
-set text_watch_comments = "отслеживать";
-set text_unwatch_comments = "перестать отслеживать";
+set text_permalink = "Ссылка";
+set text_edit_entry = "Редактировать запись";
+set text_edit_tags = "Редактировать метки";
+set text_tell_friend = "Рассказать другу";
+set text_mem_add = "В избранное";
+set text_watch_comments = "Отслеживать";
+set text_unwatch_comments = "Перестать отслеживать";
 set text_month_screened_comments = "со скрытыми";
 set text_multiform_check = "Выбрать:";
 set text_multiform_des = "Групповое действие над комментариями:";
@@ -104,6 +104,10 @@
 set text_comment_reply = "Ответить";
 set text_comment_parent = "Уровень выше";
 set text_comment_thread = "Ветвь дискуссии";
+set text_comment_expand = "Развернуть";
+set text_comment_collapse = "Свернуть";
+set text_comment_deleted = "(Удалённый комментарий)";
+set text_comment_screened = "(Скрытый комментарий)";
 set text_reply_back = "Читать комментарии";
 set text_comment_frozen = "Ответы заморожены";
 set text_reply_nocomments_header = "Комментарии отключены:";