From b8f6f7313f9cba8b0eb3786d398f73f0569a37cf Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Fri, 27 Feb 2015 14:09:00 +0100 Subject: [PATCH] Better instructions for screensharing on FF in the help page --- lib/Vroom/I18N/en.pm | 10 +++++----- lib/Vroom/I18N/fr.pm | 9 ++++----- templates/default/help.html.ep | 7 ++++++- templates/default/join.html.ep | 3 ++- 4 files changed, 17 insertions(+), 12 deletions(-) diff --git a/lib/Vroom/I18N/en.pm b/lib/Vroom/I18N/en.pm index 0ae60da..33758e8 100644 --- a/lib/Vroom/I18N/en.pm +++ b/lib/Vroom/I18N/en.pm @@ -221,14 +221,15 @@ our %Lexicon = ( "EXTENSION_REQUIRED" => "An extension is required", "VROOM_CHROME_EXTENSION" => "To enable screen sharing, you need to install an extension. Click on the following link and refresh this page", "ALLOW_SCREEN_SHARING" => "You have to allow screen sharing", - "ALLOW_SCREEN_SHARING_ON_FF_s" => "For security reasons, your browser do not allow screen sharing by default. " . - "To enable it, please follow these steps:
" . - "
    " . + "ALLOW_SCREEN_SHARING_ON_FF" => "For security reasons, your browser do not allow screen sharing by default. " . + "To enable it, please follow these steps:", + "SCREE_SHARING_ABOUT_CONFIG_s" => "
      " . "
    1. Open a new tab, and type about:config in the address bar
      2. " . "
    2. Accept the warning by clicking on the \"I'll be careful, I promise !\" button
      3. " . "
    3. Search for screensharing in the search bar
      4. " . "
    4. Double click on media.getusermedia.screensharing.allowed_domains to edit it
      5. " . "
    5. Add %s at the end of the list
      6. " . + "
    6. You can now use the screen sharing feature
      7. " . "
    ", "PAUSE_MOH" => "Play/Pause music", "WAIT_WITH_MUSIC" => "Why don't you listen to some music while waiting for others ?", @@ -289,8 +290,7 @@ our %Lexicon = ( "HELP_SCREEN_SHARING" => "VROOM lets you share your screen (or a single window) with the other members of the room. For now " . "this feature is only available with Google Chrome (requires a small extension, " . "you'll be prompted to install it first time you try to share your screen) or Mozilla Firefox." . - "To enable this feature in Mozilla Firefox, you need to go in about:config, and add VROOM address " . - "usually vroom.im) to the list media.getusermedia.screensharing.allowed_domains", + "To enable this feature in Mozilla Firefox, follow these steps:", "OWNER_PRIVILEGES" => "Room creator's privileges", "HELP_OWNER_PRIVILEGES" => "Room's creator (also called manager) has special privileges (compared to those who join " . "later, which are simple participants). For example, he can protect access with a password " . diff --git a/lib/Vroom/I18N/fr.pm b/lib/Vroom/I18N/fr.pm index 6e3d072..7d6b142 100644 --- a/lib/Vroom/I18N/fr.pm +++ b/lib/Vroom/I18N/fr.pm @@ -229,9 +229,9 @@ our %Lexicon = ( "VROOM_CHROME_EXTENSION" => "Pour activer le partage d'écran, vous devez installer une extension, cliquez sur le " . "lien ci-dessous, puis raffraîchissez cette page", "ALLOW_SCREEN_SHARING" => "Vous devez autoriser le partage d'écran", - "ALLOW_SCREEN_SHARING_ON_FF_s" => "Par mesure de sécurité, votre navigateur n'autorise pas le partgage d'écran par défaut. " . - "Pour l'activer, suivez ces étapes:
    " . - "
      " . + "ALLOW_SCREEN_SHARING_ON_FF" => "Par mesure de sécurité, votre navigateur n'autorise pas le partgage d'écran par défaut. " . + "Pour l'activer, suivez ces étapes:", + "SCREE_SHARING_ABOUT_CONFIG_s" => "
        " . "
      1. Ouvrez un nouvel onglet, et tapez about:config dans la barre d'adresse
        2. " . "
      2. Validez l'avertissement en cliquant sur le bouton \"Je ferai attention, promis !\"
        3. " . "
      3. Recherchez screensharing à l'aide de la barre de recherche
        4. " . @@ -302,8 +302,7 @@ our %Lexicon = ( "Pour l'instant, le partage d'écran ne fonctionne qu'avec les navigateurs Google Chrome " . "(nécessite l'installation d'une petite extension qui vous sera proposée " . "la première fois que vous essayez de partager votre écran) et Mozilla Firefox. Pour activer " . - "cette fonction avec Firefox, il faut aller dans about:config et ajouter l'adresse de VROOM " . - "(en général vroom.im) dans la liste media.getusermedia.screensharing.allowed_domains", + "cette fonction avec Firefox, suivez ces étapes:", "OWNER_PRIVILEGES" => "Privilèges des créateurs de salon", "HELP_OWNER_PRIVILEGES" => "Le créateur d'un salon (aussi appelé gestionnaire) dispose de privilèges spéciaux " . "sur ce dernier (par rapport à ceux qui rejoignent le salon après, qui ne seront que " . diff --git a/templates/default/help.html.ep b/templates/default/help.html.ep index 802a866..fd0b0ae 100644 --- a/templates/default/help.html.ep +++ b/templates/default/help.html.ep @@ -42,7 +42,12 @@
        - <%==l 'HELP_SCREEN_SHARING' %> +

        + <%=l 'HELP_SCREEN_SHARING' %> +

        +

        + <%== sprintf $self->l('SCREE_SHARING_ABOUT_CONFIG_s'), $self->req->url->to_abs->host %> +

        diff --git a/templates/default/join.html.ep b/templates/default/join.html.ep index 03e1884..54ef0ca 100644 --- a/templates/default/join.html.ep +++ b/templates/default/join.html.ep @@ -288,7 +288,8 @@

        - <%== sprintf $self->l('ALLOW_SCREEN_SHARING_ON_FF_s'), $self->req->url->to_abs->host %> + <%=l 'ALLOW_SCREEN_SHARING_ON_FF' %> + <%== sprintf $self->l('SCREE_SHARING_ABOUT_CONFIG_s'), $self->req->url->to_abs->host %>