[livejournal] r18788: LJSV-1495 Language changes on a tab "Dis...

U   trunk/cgi-bin/LJ/S2.pm

Modified: trunk/cgi-bin/LJ/S2.pm
===================================================================
--- trunk/cgi-bin/LJ/S2.pm	2011-04-05 04:43:39 UTC (rev 18787)
+++ trunk/cgi-bin/LJ/S2.pm	2011-04-05 05:21:58 UTC (rev 18788)
@@ -715,10 +715,14 @@
         my $bl = $remote->prop('browselang');
         
         if($bl) {
-            my $style = LJ::Customize->save_language($u, $bl, 'return' => 1);
+            my %journal_style = LJ::S2::get_style($u, "verify");
+            
+            unless ($journal_style{i18nc}) {
+                my $style = LJ::Customize->save_language($u, $bl, 'return' => 1);
 
-            $style{i18nc} = $style->{i18nc} if ($style->{i18nc});
-            $style{i18n} = $style->{i18n}   if ($style->{i18n});
+                $style{i18nc} = $style->{i18nc} if ($style->{i18nc});
+                $style{i18n} = $style->{i18n}   if ($style->{i18n});
+            }
         }   
     }