Moodle
  1. Moodle
  2. MDL-32905

Translation of 'moodlelogo' string in formal_white is misleading

    Details

    • Type: Improvement Improvement
    • Status: Closed
    • Priority: Minor Minor
    • Resolution: Fixed
    • Affects Version/s: 2.2.2
    • Fix Version/s: 2.3
    • Component/s: Themes
    • Labels:
    • Testing Instructions:
      Hide

      go to formal_white setting page
      and look at the label for "displaylogo" setting.
      It should be 'Display logo' instead of 'Display moodle logo'

      No new setting should be displayed even if three new one has been introduced.
      Some label of the theme setting page has also been changed but the page should correctly display each element. In detail, I changed:
      logo to headercontent
      customlogo to customlogourl
      frontpagelogo to frontpagelogourl

      Show
      go to formal_white setting page and look at the label for "displaylogo" setting. It should be 'Display logo' instead of 'Display moodle logo' No new setting should be displayed even if three new one has been introduced. Some label of the theme setting page has also been changed but the page should correctly display each element. In detail, I changed: logo to headercontent customlogo to customlogourl frontpagelogo to frontpagelogourl
    • Affected Branches:
      MOODLE_22_STABLE
    • Fixed Branches:
      MOODLE_23_STABLE
    • Pull from Repository:
    • Pull Master Branch:
      MDL-32905_master

      Description

      Currently in formal_white setting page I can read:
      $string['moodlelogo'] = 'Display moodle logo';
      but the user is allowed to change the original moodle logo to a different one.
      So it should be better to translate $string['moodlelogo'] as
      $string['moodlelogo'] = 'Display logo';

        Gliffy Diagrams

          Activity

          Hide
          Michael de Raadt added a comment -

          Even though this is a trivial change, only component leads can push issues straight to peer review and only in their own components.

          Show
          Michael de Raadt added a comment - Even though this is a trivial change, only component leads can push issues straight to peer review and only in their own components.
          Hide
          Michael de Raadt added a comment -

          I found out that you are maintaining Formal White. I didn't know that. Sorry. I'll push this back to Integration now.

          Show
          Michael de Raadt added a comment - I found out that you are maintaining Formal White. I didn't know that. Sorry. I'll push this back to Integration now.
          Hide
          Daniele Cordella added a comment -

          Thanks Michael!

          Show
          Daniele Cordella added a comment - Thanks Michael!
          Hide
          Mary Evans added a comment -

          Ciao Daniele

          I did wonder if it is absolutely necessary to call the actual $string 'moodlelogo' in the first place? Would it not have been simpler to just call it 'logo' as all other themes do?

          $string['logo'] = 'Logo'
          

          Of course changing it will require the settings to be changed too.

          What do you think?

          I was just going for simplicity.

          Show
          Mary Evans added a comment - Ciao Daniele I did wonder if it is absolutely necessary to call the actual $string 'moodlelogo' in the first place? Would it not have been simpler to just call it 'logo' as all other themes do? $string['logo'] = 'Logo' Of course changing it will require the settings to be changed too. What do you think? I was just going for simplicity.
          Hide
          Daniele Cordella added a comment -

          To be honest, I should say I agree with you.
          I'll post a fix asap.

          Show
          Daniele Cordella added a comment - To be honest, I should say I agree with you. I'll post a fix asap.
          Hide
          Eloy Lafuente (stronk7) added a comment -

          The main moodle.git repository has just been updated with latest weekly modifications. You may wish to rebase your PULL branches to simplify history and avoid any possible merge conflicts. This would also make integrator's life easier next week.

          TIA and ciao

          Show
          Eloy Lafuente (stronk7) added a comment - The main moodle.git repository has just been updated with latest weekly modifications. You may wish to rebase your PULL branches to simplify history and avoid any possible merge conflicts. This would also make integrator's life easier next week. TIA and ciao
          Hide
          Daniele Cordella added a comment -

          Thanks Mary. I update my github adding the modification of the string name as of your suggestion.

          Show
          Daniele Cordella added a comment - Thanks Mary. I update my github adding the modification of the string name as of your suggestion.
          Hide
          Dan Poltawski added a comment -

          Hi Daniele,

          If you are changing the name of the string then we must inform AMOS of the change:
          http://docs.moodle.org/dev/Languages/AMOS#AMOS_script

          You'll need to write an AMOS MOV in your commit message to do this.

          Show
          Dan Poltawski added a comment - Hi Daniele, If you are changing the name of the string then we must inform AMOS of the change: http://docs.moodle.org/dev/Languages/AMOS#AMOS_script You'll need to write an AMOS MOV in your commit message to do this.
          Hide
          Daniele Cordella added a comment -

          AMOS BEGIN
          MOV [moodlelogo,theme_formal_white],[logo,theme_formal_white]
          AMOS END

          Show
          Daniele Cordella added a comment - AMOS BEGIN MOV [moodlelogo,theme_formal_white] , [logo,theme_formal_white] AMOS END
          Hide
          Eloy Lafuente (stronk7) added a comment -

          The main moodle.git repository has just been updated with latest weekly modifications. You may wish to rebase your PULL branches to simplify history and avoid any possible merge conflicts. This would also make integrator's life easier next week.

          TIA and ciao

          Show
          Eloy Lafuente (stronk7) added a comment - The main moodle.git repository has just been updated with latest weekly modifications. You may wish to rebase your PULL branches to simplify history and avoid any possible merge conflicts. This would also make integrator's life easier next week. TIA and ciao
          Hide
          Dan Poltawski added a comment -

          The main moodle.git repository has just been updated with latest weekly modifications. You may wish to rebase your PULL branches to simplify history and avoid any possible merge conflicts. This would also make integrator's life easier next week.

          TIA and ciao

          Show
          Dan Poltawski added a comment - The main moodle.git repository has just been updated with latest weekly modifications. You may wish to rebase your PULL branches to simplify history and avoid any possible merge conflicts. This would also make integrator's life easier next week. TIA and ciao
          Hide
          Sam Hemelryk added a comment -

          Hi Daniele,
          Changes looked spot on thanks! they have been integrated now

          Cheers
          Sam

          Show
          Sam Hemelryk added a comment - Hi Daniele, Changes looked spot on thanks! they have been integrated now Cheers Sam
          Hide
          Sam Hemelryk added a comment -

          Tested during integration review and passed

          Show
          Sam Hemelryk added a comment - Tested during integration review and passed
          Hide
          Daniele Cordella added a comment -

          Thanks you all!

          Show
          Daniele Cordella added a comment - Thanks you all!
          Hide
          Eloy Lafuente (stronk7) added a comment -

          We could celebrate it today... but better if we perform a bigger party after releasing Moodle 2.3.

          Print this message and come to Perth that day, it's valid for one beer, wine, coke or... water, as you wish.

          Many thanks for your collaboration!

          Ciao

          Show
          Eloy Lafuente (stronk7) added a comment - We could celebrate it today... but better if we perform a bigger party after releasing Moodle 2.3. Print this message and come to Perth that day, it's valid for one beer, wine, coke or... water, as you wish. Many thanks for your collaboration! Ciao

            People

            • Votes:
              0 Vote for this issue
              Watchers:
              0 Start watching this issue

              Dates

              • Created:
                Updated:
                Resolved: