Add WPML integration for proper CiviCRM language generation civicrm#133

includes/civicrm.compat.php

@@ -229,7 +229,7 @@ public function rewrite_rules_wpml($flush_rewrite_rules, $basepage) {
   /**
    * icl_ls_languages WPML Filter
    *
-   * Modify all CiviCRM URLs to contain the proper language structure based on the WPML settings
+   * Rewrite all CiviCRM URLs to contain the proper language structure based on the WPML settings
    *
    * @param array $languages passed by WPML to modify current path
    */
@@ -245,7 +245,7 @@ public function rewrite_civicrm_urls_wpml($languages) {
     // Get CiviCRM basepage slug
     $civicrm_slug = apply_filters('civicrm_basepage_slug', 'civicrm');
 
-    // Obtain lagnuage negotiation setting
+    // Obtain WPML lagnuage negotiation setting
     $wpml_negotiation = apply_filters('wpml_setting', NULL, 'language_negotiation_type');
 
     // If this is a CiviCRM Page then let's modify the actual path
@@ -254,7 +254,7 @@ public function rewrite_civicrm_urls_wpml($languages) {
       $current_url = explode("?", $_SERVER['REQUEST_URI']);
       $civicrm_url = get_site_url(NULL, $current_url[0]);
 
-      // Remove lang from path
+      // Remove language from path
       $wpml_negotiation = apply_filters('wpml_setting', NULL, 'language_negotiation_type');
       $civicrm_url = $this->wpml_remove_language_from_url($civicrm_url, $sitepress, $wpml_negotiation);