Doc switchers: Desambiguate the need of a replace(/\/+$/g, '') by proper naming.

Author: JulienPalard

Doc/tools/static/switchers.js

@@ -69,8 +69,8 @@
   function on_version_switch() {
     var selected_version = $(this).children('option:selected').attr('value') + '/';
     var url = window.location.href;
-    var current_language = find_language_in_url(url);
-    var current_version = find_version_in_url(url);
+    var current_language = language_segment_from_url(url);
+    var current_version = version_segment_in_url(url);
     var new_url = url.replace('.org/' + current_language + current_version,
                               '.org/' + current_language + selected_version);
     if (new_url != url) {
@@ -82,8 +82,8 @@
   function on_language_switch() {
     var selected_language = $(this).children('option:selected').attr('value') + '/';
     var url = window.location.href;
-    var current_language = find_language_in_url(url);
-    var current_version = find_version_in_url(url);
+    var current_language = language_segment_from_url(url);
+    var current_version = version_segment_in_url(url);
     if (selected_language == 'en/') // Special 'default' case for english.
       selected_language = '';
     var new_url = url.replace('.org/' + current_language + current_version,
@@ -94,17 +94,19 @@
     }
   }
 
-  // Returns the path segment as a string, like 'fr/' or '' if not found.
-  function find_language_in_url(url) {
+  // Returns the path segment of the language as a string, like 'fr/'
+  // or '' if not found.
+  function language_segment_from_url(url) {
     var language_regexp = '\.org/(' + Object.keys(all_languages).join('|') + '/)';
     var match = url.match(language_regexp);
     if (match !== null)
         return match[1];
     return '';
   }
 
-  // Returns the path segment as a string, like '3.6/' or '' if not found.
-  function find_version_in_url(url) {
+  // Returns the path segment of the version as a string, like '3.6/'
+  // or '' if not found.
+  function version_segment_in_url(url) {
     var language_segment = '(?:(?:' + Object.keys(all_languages).join('|') + ')/)';
     var version_segment = '(?:(?:' + version_regexs.join('|') + ')/)';
     var version_regexp = '\\.org/' + language_segment + '?(' + version_segment + ')';
@@ -116,8 +118,8 @@
 
   $(document).ready(function() {
     var release = DOCUMENTATION_OPTIONS.VERSION;
-    var current_language = find_language_in_url(window.location.href).replace(
-            /\/+$/g, '') || 'en';
+    var language_segment = language_segment_from_url(window.location.href);
+    var current_language = language_segment.replace(/\/+$/g, '') || 'en';
     var version = release.substr(0, 3);
     var version_select = build_version_select(version, release);