enmi-conf.org: comparison wp/wp-includes/pomo/mo.php

equal deleted inserted replaced

-:be944660c56a
+:3d72ae0968f4
 		 * Fills up with the entries from MO file $filename
 		 *
 		 * @param string $filename MO file to load
 		 * @return bool True if the import from file was successful, otherwise false.
 		 */
-		function import_from_file( $filename ) {
+		public function import_from_file( $filename ) {
 			$reader = new POMO_FileReader( $filename );
 			if ( ! $reader->is_resource() ) {
 				return false;
 			}
 		/**
 		 * @param string $filename
 		 * @return bool
 		 */
-		function export_to_file( $filename ) {
+		public function export_to_file( $filename ) {
 			$fh = fopen( $filename, 'wb' );
 			if ( ! $fh ) {
 				return false;
 			}
 			$res = $this->export_to_file_handle( $fh );
 		}
 		/**
 		 * @return string|false
 		 */
-		function export() {
+		public function export() {
 			$tmp_fh = fopen( 'php://temp', 'r+' );
 			if ( ! $tmp_fh ) {
 				return false;
 			}
 			$this->export_to_file_handle( $tmp_fh );
 		/**
 		 * @param Translation_Entry $entry
 		 * @return bool
 		 */
-		function is_entry_good_for_export( $entry ) {
+		public function is_entry_good_for_export( $entry ) {
 			if ( empty( $entry->translations ) ) {
 				return false;
 			}
 			if ( ! array_filter( $entry->translations ) ) {
 		/**
 		 * @param resource $fh
 		 * @return true
 		 */
-		function export_to_file_handle( $fh ) {
+		public function export_to_file_handle( $fh ) {
 			$entries = array_filter( $this->entries, array( $this, 'is_entry_good_for_export' ) );
 			ksort( $entries );
 			$magic                     = 0x950412de;
 			$revision                  = 0;
 			$total                     = count( $entries ) + 1; // All the headers are one entry.
-			$originals_lenghts_addr    = 28;
+			$originals_lengths_addr    = 28;
-			$translations_lenghts_addr = $originals_lenghts_addr + 8 * $total;
+			$translations_lengths_addr = $originals_lengths_addr + 8 * $total;
 			$size_of_hash              = 0;
-			$hash_addr                 = $translations_lenghts_addr + 8 * $total;
+			$hash_addr                 = $translations_lengths_addr + 8 * $total;
 			$current_addr              = $hash_addr;
 			fwrite(
 				$fh,
 				pack(
 					'V*',
 					$magic,
 					$revision,
 					$total,
-					$originals_lenghts_addr,
+					$originals_lengths_addr,
-					$translations_lenghts_addr,
+					$translations_lengths_addr,
 					$size_of_hash,
 					$hash_addr
 				)
 			);
-			fseek( $fh, $originals_lenghts_addr );
+			fseek( $fh, $originals_lengths_addr );
 			// Headers' msgid is an empty string.
 			fwrite( $fh, pack( 'VV', 0, $current_addr ) );
 			$current_addr++;
 			$originals_table = "\0";
 		/**
 		 * @param Translation_Entry $entry
 		 * @return string
 		 */
-		function export_original( $entry ) {
+		public function export_original( $entry ) {
 			// TODO: Warnings for control characters.
 			$exported = $entry->singular;
 			if ( $entry->is_plural ) {
 				$exported .= "\0" . $entry->plural;
 			}
 		/**
 		 * @param Translation_Entry $entry
 		 * @return string
 		 */
-		function export_translations( $entry ) {
+		public function export_translations( $entry ) {
 			// TODO: Warnings for control characters.
 			return $entry->is_plural ? implode( "\0", $entry->translations ) : $entry->translations[0];
 		}
 		/**
 		 * @return string
 		 */
-		function export_headers() {
+		public function export_headers() {
 			$exported = '';
 			foreach ( $this->headers as $header => $value ) {
 				$exported .= "$header: $value\n";
 			}
 			return $exported;
 		/**
 		 * @param int $magic
 		 * @return string|false
 		 */
-		function get_byteorder( $magic ) {
+		public function get_byteorder( $magic ) {
 			// The magic is 0x950412de.
 			// bug in PHP 5.0.2, see https://savannah.nongnu.org/bugs/?func=detailitem&item_id=10565
 			$magic_little    = (int) - 1794895138;
 			$magic_little_64 = (int) 2500072158;
 		/**
 		 * @param POMO_FileReader $reader
 		 * @return bool True if the import was successful, otherwise false.
 		 */
-		function import_from_reader( $reader ) {
+		public function import_from_reader( $reader ) {
 			$endian_string = MO::get_byteorder( $reader->readint32() );
 			if ( false === $endian_string ) {
 				return false;
 			}
 			$reader->setEndian( $endian_string );
 			if ( $reader->strlen( $header ) != 24 ) {
 				return false;
 			}
 			// Parse header.
-			$header = unpack( "{$endian}revision/{$endian}total/{$endian}originals_lenghts_addr/{$endian}translations_lenghts_addr/{$endian}hash_length/{$endian}hash_addr", $header );
+			$header = unpack( "{$endian}revision/{$endian}total/{$endian}originals_lengths_addr/{$endian}translations_lengths_addr/{$endian}hash_length/{$endian}hash_addr", $header );
 			if ( ! is_array( $header ) ) {
 				return false;
 			}
 			// Support revision 0 of MO format specs, only.
 			if ( 0 != $header['revision'] ) {
 				return false;
 			}
 			// Seek to data blocks.
-			$reader->seekto( $header['originals_lenghts_addr'] );
+			$reader->seekto( $header['originals_lengths_addr'] );
 			// Read originals' indices.
-			$originals_lengths_length = $header['translations_lenghts_addr'] - $header['originals_lenghts_addr'];
+			$originals_lengths_length = $header['translations_lengths_addr'] - $header['originals_lengths_addr'];
 			if ( $originals_lengths_length != $header['total'] * 8 ) {
 				return false;
 			}
 			$originals = $reader->read( $originals_lengths_length );
 			if ( $reader->strlen( $originals ) != $originals_lengths_length ) {
 				return false;
 			}
 			// Read translations' indices.
-			$translations_lenghts_length = $header['hash_addr'] - $header['translations_lenghts_addr'];
+			$translations_lengths_length = $header['hash_addr'] - $header['translations_lengths_addr'];
-			if ( $translations_lenghts_length != $header['total'] * 8 ) {
+			if ( $translations_lengths_length != $header['total'] * 8 ) {
 				return false;
 			}
-			$translations = $reader->read( $translations_lenghts_length );
+			$translations = $reader->read( $translations_lengths_length );
-			if ( $reader->strlen( $translations ) != $translations_lenghts_length ) {
+			if ( $reader->strlen( $translations ) != $translations_lengths_length ) {
 				return false;
 			}
 			// Transform raw data into set of indices.
 			$originals    = $reader->str_split( $originals, 8 );
 		 *  0x04 as context separator or 0x00 as singular/plural separator
 		 * @param string $translation translation string from MO file. Might contain
 		 *  0x00 as a plural translations separator
 		 * @return Translation_Entry Entry instance.
 		 */
-		function &make_entry( $original, $translation ) {
+		public function &make_entry( $original, $translation ) {
 			$entry = new Translation_Entry();
 			// Look for context, separated by \4.
 			$parts = explode( "\4", $original );
 			if ( isset( $parts[1] ) ) {
 				$original       = $parts[1];
 		/**
 		 * @param int $count
 		 * @return string
 		 */
-		function select_plural_form( $count ) {
+		public function select_plural_form( $count ) {
 			return $this->gettext_select_plural_form( $count );
 		}
 		/**
 		 * @return int
 		 */
-		function get_plural_forms_count() {
+		public function get_plural_forms_count() {
 			return $this->_nplurals;
 		}
 	}
 endif;

changeset 19	3d72ae0968f4
parent 18	be944660c56a
child 21	48c4eec2b7e6