[DW-Changelog] dw-free: 2 new changesets

[Dreamwidth Changelog]

diffs (81 lines):

diff -r 3f4ce4b2ddd9 -r 499b6aed96e6 cgi-bin/LJ/S2.pm
--- a/cgi-bin/LJ/S2.pm  Sun Jul 05 16:40:08 2009 +0000
+++ b/cgi-bin/LJ/S2.pm  Sun Jul 05 17:09:33 2009 +0000
@@ -69,7 +69,7 @@ sub make_journal
         return;
     }
 
-    my $lang = 'en';
+    my $lang = $remote && $remote->prop( "browselang" );
     LJ::run_hook('set_s2bml_lang', $ctx, \$lang);
 
     # note that's it's very important to pass LJ::Lang::get_text here 
explicitly
diff -r 3f4ce4b2ddd9 -r 499b6aed96e6 htdocs/userinfo.bml
--- a/htdocs/userinfo.bml       Sun Jul 05 16:40:08 2009 +0000
+++ b/htdocs/userinfo.bml       Sun Jul 05 17:09:33 2009 +0000
@@ -922,6 +922,40 @@ body<=
     }
 
 
################################################################################
+##### LINKING MODULE
+
+    if ( $u->is_individual || $u->is_community ) {
+
+        my $local_link .= "<user name=\"" . $u->username . "\">";
+        my $remote_link .= $u->ljuser_display;
+
+
+        my $link_body = "<div style='font-style:italic;'>" . BML::ml( 
'.linking.about' ) . "</div>";
+        $link_body .= BML::ml( '.linking.local', { sitename => 
$LJ::SITENAMESHORT }) . LJ::html_text({
+                             name      => 'local',
+                             id        => 'local',
+                             size      => 50,
+                             maxlength => 100,
+                             value     => $local_link,
+                             }) . "<br />";
+        $link_body .= "$ML{'.linking.anywhere'} " . LJ::html_text({
+                             name      => 'local',
+                             id        => 'local',
+                             size      => 50,
+                             maxlength => 550,
+                             value     => $remote_link,
+                             }) . "<br />";
+
+        $ret .=  $content_block->(
+            section_name   => 'linking',
+            section_name_ml => '.label.linking',
+            body           => $link_body,
+            hidable        => 1,
+         );
+    }
+
+
+################################################################################
 ##### END
 
     $ret .= q{ <div class='ljclear'></div> };
diff -r 3f4ce4b2ddd9 -r 499b6aed96e6 htdocs/userinfo.bml.text
--- a/htdocs/userinfo.bml.text  Sun Jul 05 16:40:08 2009 +0000
+++ b/htdocs/userinfo.bml.text  Sun Jul 05 17:09:33 2009 +0000
@@ -246,6 +246,8 @@
 
 .label.last_fm_user2=Last.fm user:
 
+.label.linking=Linking
+
 .label.location=Location:
 
 .label.maintainers=Maintainers ([[num]]):
@@ -309,6 +311,12 @@
 .label.website=Website:
 
 .label.yahooid=Yahoo! ID:
+
+.linking.about=To link to this user, copy this code:
+
+.linking.local=On [[sitename]]:
+
+.linking.anywhere=Elsewhere:
 
 .members.header=Members
 
_______________________________________________
dw-changelog mailing list
dw-changelog@lists.dwscoalition.org
http://lists.dwscoalition.org/mailman/listinfo/dw-changelog