From: Phil J. <ph...@jo...> - 2009-02-08 23:04:16
|
Now we are getting closer to the misunderstanding. My language is not Spanish. In fact I chose Spanish specifically, because it is neither my language not (I think) your language. This is now a question of what the functionality should be. In my opinion, when you select a language from the dropdown list, this should have nothing to do with the language selected in the browser or operating system. In fact, if the language is selected by the system, then why would you need the dropdown list anyway? For me, the whole point of the drop down list, is to change the language from the default, to some other language. I specifically want it to work when the language is not the current language of the browser or operating system. Phil ----- Original Message ----- From: "Sylvie Greverend" <sgr...@gm...> To: "Phil Jollans" <ph...@jo...> Cc: <tik...@li...> Sent: Sunday, February 08, 2009 11:25 PM Subject: Re: [Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[16611] trunk > On Sun, 2009-02-08 at 22:00 +0100, Phil Jollans wrote: >> Hi Sylvie, >> >> I can't see this. If I go to the introduction in spanish >> http://doc.tikiwiki.org/tiki-index.php?page=Introduction%2Ces >> and then click on "Características" (at the end of the 4th paragraph) it >> loads the english features page. I would prefer it to load the spanish >> version Funcionalidades, but it doesn't. > It works for me. > Is Spanish your language when you do that. Because it must be . Best > language chooses the page in your current language. > If your currant language is En, yes it will be come back to the Engliash > page. If you need another behavior, you will need another setting. >> >> This is not an isolated example. It occurs systematically for all links >> which are not specifically spanish. >> >> I get exactly the same behaviour if I am logged in or not. >> >> Phil >> >> ----- Original Message ----- >> From: "Sylvie Greverend" <sgr...@gm...> >> To: "Phil Jollans" <ph...@jo...> >> Cc: <tik...@li...> >> Sent: Sunday, February 08, 2009 8:28 PM >> Subject: Re: [Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[16611] trunk >> >> >> > ah! ah! >> > For your example, I found one bug - the structure is searched before >> > the >> > page in the right language is found.Ah Ah! >> > http://doc.tikiwiki.org/tiki-index.php?page=Documentation&bl=y >> > So the top of the page - you can see 'volver a HomePage' >> > But the {toc} is wrong - I will fix it in trunk. >> > But it is working perfectly >> > >> > PS: You need to be log-in - the switch language module is bugged for >> > anonymous >> > >> > On Sun, 2009-02-08 at 19:22 +0100, Phil Jollans wrote: >> >> doc.tikiwiki.org is full of such examples. >> >> >> >> I'm guessing that your system might be french, so lets look at a >> >> different >> >> language, say spanish. >> >> >> >> The spanish homepage is >> >> http://doc.tikiwiki.org/tiki-index.php?page=HomePage%2Ces >> >> >> >> Almost all of the links on this page are not to specific spanish >> >> pages, >> >> for >> >> example "Tikiwiki", "Communidad Tikiwiki", "Documentación", "Visión >> >> General", etc. These all send me straight back to the english version, >> >> although some, but not all, are available in spanish. >> >> >> >> If I look at the french pages (which appear to have a greater extent >> >> than >> >> the Spanish ones) I see a lot of links to specific french pages. This >> >> is >> >> presumably because they would otherwise link to the english version. >> >> >> >> Even if you accept the need for my change, it may not be perfect. It >> >> would >> >> make it difficult, if not impossible, to deliberatly link to a page in >> >> a >> >> different language. >> >> >> >> Phil >> >> >> >> >> >> ----- Original Message ----- >> >> From: "Sylvie Greverend" <sgr...@gm...> >> >> To: "Phil Jollans" <ph...@jo...> >> >> Cc: <tik...@li...> >> >> Sent: Sunday, February 08, 2009 6:16 PM >> >> Subject: Re: [Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[16611] trunk >> >> >> >> >> >> > Not working for me too. >> >> > But this site has all the settings for best translation and so on .. >> >> > and >> >> > the English page is the best translation - so perhaps it is >> >> > different - >> >> > I do not know very the behavior of this feature. >> >> > Can you find an example that on doc.tikiwiki.org? >> >> > (using FF) >> >> > Thx >> >> > >> >> > >> >> > >> >> > On Sun, 2009-02-08 at 17:54 +0100, Phil Jollans wrote: >> >> >> Hi Sylvie, >> >> >> >> >> >> I think there may be a browser issue here. >> >> >> >> >> >> Here is an example (not mine, I think it is Marc Laporte's). Goto >> >> >> www.wiki-translation.com. On the first page, switch the language to >> >> >> French. >> >> >> Now click on the link for Babel Wiki 08 (could be out of date!). >> >> >> This >> >> >> page >> >> >> is available in French, so I would expect it to appear in French. >> >> >> >> >> >> I have tried this with Firefox, Opera, Internet Explorer 7 and >> >> >> Safari >> >> >> and >> >> >> in >> >> >> all cases I get the English version. >> >> >> >> >> >> Only in one case did I get the French version, and that was using >> >> >> FireFox >> >> >> with the "Quick Locale Switcher" Add-On. I cannot explain that. >> >> >> >> >> >> Can you please try that example, and also say what browser you are >> >> >> using. >> >> >> >> >> >> Phil >> >> >> >> >> >> >> >> >> ----- Original Message ----- >> >> >> From: "Sylvie Greverend" <sgr...@gm...> >> >> >> To: "Phil Jollans" <ph...@jo...> >> >> >> Cc: "CVS/SVN commits information" >> >> >> <tik...@li...> >> >> >> Sent: Sunday, February 08, 2009 5:01 PM >> >> >> Subject: Re: [Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[16611] trunk >> >> >> >> >> >> >> >> >> > Hi Phil, >> >> >> > ok, I tested in 2.x >> >> >> > attached my admin->i18n page >> >> >> > attached my 'article,en' page. >> >> >> > When I click on 'article,fr' I go to 'article,en' >> >> >> > So I do not understand what you try to fix >> >> >> > Thank you >> >> >> > sylvie >> >> >> > >> >> >> > On Sun, 2009-02-08 at 16:28 +0100, Phil Jollans wrote: >> >> >> >> Hi Sylvie, >> >> >> >> >> >> >> >> it's difficult for me to go back and reproduce this now, because >> >> >> >> I >> >> >> >> would >> >> >> >> have to undo my patch. >> >> >> >> >> >> >> >> However, I am really sure that version 2.2 does not work as you >> >> >> >> describe. >> >> >> >> A >> >> >> >> link to ((page,fr)) would always show ((page,fr)), even if it >> >> >> >> was >> >> >> >> embedded >> >> >> >> in an english page, and even if the system language was english. >> >> >> >> >> >> >> >> Of course, there might already have been a fix in the trunk >> >> >> >> version, >> >> >> >> which I >> >> >> >> was not aware of. >> >> >> >> >> >> >> >> Phil >> >> >> >> >> >> >> >> >> >> >> >> ----- Original Message ----- >> >> >> >> From: "Sylvie Greverend" <sgr...@gm...> >> >> >> >> To: "CVS/SVN commits information" >> >> >> >> <tik...@li...>; >> >> >> >> <pjo...@us...> >> >> >> >> Sent: Sunday, February 08, 2009 3:50 PM >> >> >> >> Subject: Re: [Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[16611] >> >> >> >> trunk >> >> >> >> >> >> >> >> >> >> >> >> > Are you sure about this one? I just tested before I svn up >> >> >> >> > 2 pages ((page, en)) (page, fr)) if I click on ((page,fr)) if >> >> >> >> > I >> >> >> >> > am >> >> >> >> > in >> >> >> >> > en, I go to ((page,en)). The only way to go to ((page,fr)) is >> >> >> >> > to >> >> >> >> > switch >> >> >> >> > language or to click in the translation box. >> >> >> >> > >> >> >> >> > It works perfectly as you described - so I do not see the >> >> >> >> > interest >> >> >> >> > of >> >> >> >> > the commit. Can you explain more the problem you had? >> >> >> >> > Thanks >> >> >> >> > >> >> >> >> > >> >> >> >> > On Sun, 2009-02-08 at 14:12 +0000, >> >> >> >> > pjo...@us... >> >> >> >> > wrote: >> >> >> >> >> Revision: 16611 >> >> >> >> >> >> >> >> >> >> http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=16611&view=rev >> >> >> >> >> Author: pjollans >> >> >> >> >> Date: 2009-02-08 14:12:18 +0000 (Sun, 08 Feb 2009) >> >> >> >> >> >> >> >> >> >> Log Message: >> >> >> >> >> ----------- >> >> >> >> >> Modified logic for selection of the best language for wiki >> >> >> >> >> pages. >> >> >> >> >> >> >> >> >> >> Previously, the 'best language' logic was only used if no >> >> >> >> >> specific >> >> >> >> >> wiki >> >> >> >> >> page >> >> >> >> >> was specified, i.e. only on the default wiki page. This meant >> >> >> >> >> that >> >> >> >> >> if >> >> >> >> >> you >> >> >> >> >> selected >> >> >> >> >> a specific language version of a given page, and then >> >> >> >> >> followed a >> >> >> >> >> link >> >> >> >> >> to >> >> >> >> >> another >> >> >> >> >> wiki page, you would go back to the original language, even >> >> >> >> >> if >> >> >> >> >> there >> >> >> >> >> was >> >> >> >> >> a >> >> >> >> >> translated version of the new page. >> >> >> >> >> >> >> >> >> >> In the new version, the 'best language' is always used, >> >> >> >> >> unless a >> >> >> >> >> specific >> >> >> >> >> version has been selected via the dropdown list. Furthermore, >> >> >> >> >> when >> >> >> >> >> the >> >> >> >> >> user >> >> >> >> >> selects a specific language, the selected language is stored >> >> >> >> >> in >> >> >> >> >> a >> >> >> >> >> session >> >> >> >> >> variable as his or her preferred language, and later used in >> >> >> >> >> the >> >> >> >> >> 'best >> >> >> >> >> language' >> >> >> >> >> selection. >> >> >> >> >> >> >> >> >> >> The update consists of the changes: >> >> >> >> >> 1. A hidden input field userLanguageSelected is added to >> >> >> >> >> translated-lang.tpl >> >> >> >> >> 2. The logic to set $use_best_language in tiki-index.php is >> >> >> >> >> moved >> >> >> >> >> down >> >> >> >> >> a >> >> >> >> >> couple >> >> >> >> >> of lines, so that is applies when a specific wiki page is >> >> >> >> >> selected. >> >> >> >> >> However, >> >> >> >> >> is does not set $use_best_language if the hidden input >> >> >> >> >> userLanguageSelected >> >> >> >> >> is detected. >> >> >> >> >> 3. When the hidden input userLanguageSelected is detected, >> >> >> >> >> the >> >> >> >> >> language >> >> >> >> >> of >> >> >> >> >> the selected page is stored in the session variable >> >> >> >> >> prefLang >> >> >> >> >> (in >> >> >> >> >> tiki-index.php). >> >> >> >> >> 4. In the function preferedLangs() in multilinguallib.php, if >> >> >> >> >> there >> >> >> >> >> is >> >> >> >> >> a >> >> >> >> >> session variable prefLang, then the language stored in >> >> >> >> >> this >> >> >> >> >> variable >> >> >> >> >> is placed >> >> >> >> >> at the head of the list of preferred languages. >> >> >> >> >> >> >> >> >> >> Modified Paths: >> >> >> >> >> -------------- >> >> >> >> >> trunk/lib/multilingual/multilinguallib.php >> >> >> >> >> trunk/templates/translated-lang.tpl >> >> >> >> >> trunk/tiki-index.php >> >> >> >> >> >> >> >> >> >> Modified: trunk/lib/multilingual/multilinguallib.php >> >> >> >> >> =================================================================== >> >> >> >> >> --- trunk/lib/multilingual/multilinguallib.php 2009-02-07 >> >> >> >> >> 23:42:46 >> >> >> >> >> UTC >> >> >> >> >> (rev 16610) >> >> >> >> >> +++ trunk/lib/multilingual/multilinguallib.php 2009-02-08 >> >> >> >> >> 14:12:18 >> >> >> >> >> UTC >> >> >> >> >> (rev 16611) >> >> >> >> >> @@ -225,6 +225,13 @@ >> >> >> >> >> global $user, $prefs, $tikilib; >> >> >> >> >> $langs = array(); >> >> >> >> >> >> >> >> >> >> + // If the user's preferred language is stored as a session >> >> >> >> >> variable, >> >> >> >> >> + // then make it the first element in the langs array. >> >> >> >> >> + if ( isset($_SESSION['prefLang']) ) >> >> >> >> >> + { >> >> >> >> >> + $langs[] = $_SESSION['prefLang'] ; >> >> >> >> >> + } >> >> >> >> >> + >> >> >> >> >> if ($langContext) { >> >> >> >> >> $langs[] = $langContext; >> >> >> >> >> if (strchr($langContext, "-")) // add en if en-uk >> >> >> >> >> >> >> >> >> >> Modified: trunk/templates/translated-lang.tpl >> >> >> >> >> =================================================================== >> >> >> >> >> --- trunk/templates/translated-lang.tpl 2009-02-07 23:42:46 >> >> >> >> >> UTC >> >> >> >> >> (rev >> >> >> >> >> 16610) >> >> >> >> >> +++ trunk/templates/translated-lang.tpl 2009-02-08 14:12:18 >> >> >> >> >> UTC >> >> >> >> >> (rev >> >> >> >> >> 16611) >> >> >> >> >> @@ -54,6 +54,8 @@ >> >> >> >> >> <option value="_translate_">{tr}Translate{/tr}</option> >> >> >> >> >> {/if} >> >> >> >> >> </select> >> >> >> >> >> + {* Hidden input to distinguish a selection from this list, >> >> >> >> >> from >> >> >> >> >> any >> >> >> >> >> other request. *} >> >> >> >> >> + <input type="hidden" name="userLanguageSelected" >> >> >> >> >> value="1"> >> >> >> >> >> </form> >> >> >> >> >> {/if} >> >> >> >> >> >> >> >> >> >> >> >> >> >> >> Modified: trunk/tiki-index.php >> >> >> >> >> =================================================================== >> >> >> >> >> --- trunk/tiki-index.php 2009-02-07 23:42:46 UTC (rev 16610) >> >> >> >> >> +++ trunk/tiki-index.php 2009-02-08 14:12:18 UTC (rev 16611) >> >> >> >> >> @@ -92,11 +92,14 @@ >> >> >> >> >> } else { >> >> >> >> >> $access->display_error( '', tra('No name indicated for wiki >> >> >> >> >> page')); >> >> >> >> >> } >> >> >> >> >> - if ($prefs['feature_best_language'] == 'y') { >> >> >> >> >> - $use_best_language = true; >> >> >> >> >> - } >> >> >> >> >> } >> >> >> >> >> >> >> >> >> >> +// Always choose the best language, unless the page has been >> >> >> >> >> selected >> >> >> >> >> from the >> >> >> >> >> +// dropdown language list, as indicated by the intut >> >> >> >> >> userLanguageSelected. >> >> >> >> >> +if ( ( !isset($_REQUEST['userLanguageSelected']) ) and >> >> >> >> >> ($prefs['feature_best_language'] == 'y') ) { >> >> >> >> >> + $use_best_language = true; >> >> >> >> >> +} >> >> >> >> >> + >> >> >> >> >> $structs_with_perm = array(); >> >> >> >> >> if( $prefs['feature_wiki_structure'] == 'y' ) { >> >> >> >> >> $structure = 'n'; >> >> >> >> >> @@ -191,6 +194,12 @@ >> >> >> >> >> if (!$info) >> >> >> >> >> $info = $tikilib->get_page_info($page); >> >> >> >> >> >> >> >> >> >> +// If the user has selected a language from the dropdown >> >> >> >> >> lise, >> >> >> >> >> then >> >> >> >> >> make >> >> >> >> >> +// the selected language the user's preferred language. >> >> >> >> >> +if ( isset($_REQUEST['userLanguageSelected']) ) >> >> >> >> >> +{ >> >> >> >> >> + $_SESSION['prefLang'] = $info['lang'] ; >> >> >> >> >> +} >> >> >> >> >> >> >> >> >> >> // If the page doesn't exist then display an error >> >> >> >> >> if(empty($info) && !($user && >> >> >> >> >> $prefs['feature_wiki_userpage'] >> >> >> >> >> == >> >> >> >> >> 'y' >> >> >> >> >> && >> >> >> >> >> strcasecmp($prefs['feature_wiki_userpage_prefix'].$user, >> >> >> >> >> $page) >> >> >> >> >> == >> >> >> >> >> 0)) >> >> >> >> >> { >> >> >> >> >> >> >> >> >> >> >> >> >> >> >> This was sent by the SourceForge.net collaborative >> >> >> >> >> development >> >> >> >> >> platform, >> >> >> >> >> the world's largest Open Source development site. >> >> >> >> >> >> >> >> >> >> ------------------------------------------------------------------------------ >> >> >> >> >> Create and Deploy Rich Internet Apps outside the browser with >> >> >> >> >> Adobe(R)AIR(TM) >> >> >> >> >> software. With Adobe AIR, Ajax developers can use existing >> >> >> >> >> skills >> >> >> >> >> and >> >> >> >> >> code to >> >> >> >> >> build responsive, highly engaging applications that combine >> >> >> >> >> the >> >> >> >> >> power >> >> >> >> >> of >> >> >> >> >> local >> >> >> >> >> resources and data with the reach of the web. Download the >> >> >> >> >> Adobe >> >> >> >> >> AIR >> >> >> >> >> SDK >> >> >> >> >> and >> >> >> >> >> Ajax docs to start building applications >> >> >> >> >> today-http://p.sf.net/sfu/adobe-com >> >> >> >> >> _______________________________________________ >> >> >> >> >> Tikiwiki-cvs mailing list >> >> >> >> >> Tik...@li... >> >> >> >> >> https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs >> >> >> >> > >> >> >> >> > >> >> >> >> >> >> >> > >> >> >> >> >> > >> >> > >> >> >> > >> > >> > > |