twisterarmy/twister-html
1
0
Fork 0
mirror of https://github.com/twisterarmy/twister-html.git synced 2025-01-27 07:04:24 +00:00
Code Issues Projects Releases Wiki Activity

changed conversation twists expand label to 'Show conversation'

Browse Source
This commit is contained in:
erqan 2014-05-07 13:28:16 +03:00
parent 694463cbc7
commit 0e18ee0912
3 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
js/interface_common.js
View File

@ -451,7 +451,13 @@ var postExpandFunction = function( e, postLi )
else
{
postLi.removeClass( openClass );
$postInteractionText.text( polyglot.t("Expand") );
var postData = postLi.find('.post-data.original');
if (typeof(postData.attr('data-replied-to-id')) === 'undefined')
$postInteractionText.text( polyglot.t("Expand") );
else
$postInteractionText.text( polyglot.t("Show conversation") );
if( $postsRelated ) $postsRelated.slideUp( "fast" );
$postExpandedContent.slideUp( "fast", function()
@ -1222,6 +1228,7 @@ function initInterfaceCommon() {
if(!$(event.target).hasClass("cancel")) return;
if($(".modal-content").attr("style") != undefined){$(".modal-content").removeAttr("style")};
$('.modal-back').css('display', 'none');
$('.mark-all-as-read').css('display', 'none');
});
$('.modal-back').on('click', function(){
if($('.modal-content .direct-messages-list')[0]) return;

13
js/interface_localization.js
View File

@ -224,7 +224,9 @@ if(preferredLanguage == "en"){
"Show with every user name": "Show with every user name",
"Show at profile modal only": "Show at profile modal only",
"Show if a user follows me": "Show if a user follows me",
"follows you": "follows you"
"follows you": "follows you",
"Show conversation": "Show conversation",
"Mark all as read": "Mark all as read"
};
}
if(preferredLanguage == "es"){
@ -1669,7 +1671,7 @@ if(preferredLanguage == "tr"){
"Cancel": "İptal",
"Change user": "Kullanıcı değiştir",
"Checking...": "Denetleniyor...", // checking if username is available
"Collapse": "Daralt", // smaller view of a post
"Collapse": "Kapat", // smaller view of a post
"Configure block generation": "Blok üretim ayarları",
"Connections:": "Bağlantılar: ", // to network
"Connection lost.": "Bağlantı koptu.",
@ -1689,7 +1691,7 @@ if(preferredLanguage == "tr"){
"Error in 'createwalletuser' RPC.": "'createwalletuser' RPC'de (Uzak Yordam Çağrısında) hata.",
"Error in 'importprivkey'": "'importprivkey' RPC'de (Uzak Yordam Çağrısında) hata: %{rpc}",
"Error in 'sendnewusertransaction' RPC.": "'sendnewusertransaction' RPC'de (Uzak Yordam Çağrısında) hata.",
"Expand": "Genişlet", // larger view of a post
"Expand": "Aç", // larger view of a post
"Favorite": "Favori",
"File APIs not supported in this browser.": "Tarayıcınızda dosya API'si desteklenmiyor.",
"Follow": "Takip et",
@ -1848,7 +1850,10 @@ if(preferredLanguage == "tr"){
"Show with every user name": "Tüm kullanıcı adlarının yanında göster",
"Show at profile modal only": "Sadece profilinde göster",
"Show if a user follows me": "Bir kullanıcının beni takip edip etmediğini göster",
"follows you": "seni takip ediyor"
"follows you": "seni takip ediyor",
"Show conversation": "Sohbeti göster",
"Mark all as read": "hepsini okundu olarak işaretle"
};
}

2
js/twister_formatpost.js
View File

@ -68,6 +68,8 @@ function postToElem( post, kind ) {
if( "reply" in userpost ) {
postData.attr('data-replied-to-screen-name', userpost["reply"]["n"]);
postData.attr('data-replied-to-id', userpost["reply"]["k"]);
postData.find('.post-expand').text(polyglot.t("Show conversation"));
}
var postInfoName = elem.find(".post-info-name");