Changeset 35686

Timestamp:

11/18/2015 08:36:50 PM (9 years ago)

Author:

SergeyBiryukov

Message:

I18N: After [35620], move the code for standardizing on \n line endings to Translation_Entry::key().

Props dd32.
Fixes #22172.

Location:

trunk/src/wp-includes/pomo

Files:

• entry.php (modified) (1 diff)
• translations.php (modified) (1 diff)

trunk/src/wp-includes/pomo/entry.php

@@ -70 +70 @@
     function key() {
         if (is_null($this->singular)) return false;
-        // prepend context and EOT, like in MO files
-        return is_null($this->context)? $this->singular : $this->context.chr(4).$this->singular;
+
+        // Prepend context and EOT, like in MO files
+        $key = is_null($this->context)? $this->singular : $this->context.chr(4).$this->singular;
+        // Standardize on \n line endings
+        $key = str_replace( array( "\r\n", "\r" ), "\n", $key );
+
+        return $key;
     }
 

trunk/src/wp-includes/pomo/translations.php

@@ -83 +83 @@
     function translate_entry(&$entry) {
         $key = $entry->key();
-        $key = str_replace( "\r\n", "\n", $key );
         return isset($this->entries[$key])? $this->entries[$key] : false;
     }