← All changes | include/mo.php +20 -69 3.0 → 3.6.7 View file →

		@@ -7,110 +7,61 @@
7	7	* Manages strings translations storage
8	8	*
9	9	* @since 1.2
10	10	* @since 2.1 Stores the strings in a post meta instead of post content to avoid unserialize issues (See #63)
	11	+ * @since 3.4 Stores the strings into language taxonomy term meta instead of a post meta.
11	12	*/
12	13	class PLL_MO extends MO {
13	14
14	15	/**
15		- * Registers the polylang_mo custom post type, only at first object creation
	16	+ * Writes the strings into a term meta.
16	17	*
17	18	* @since 1.2
18		- */
19		- public function __construct() {
20		- if ( ! post_type_exists( 'polylang_mo' ) ) {
21		- $labels = array( 'name' => __( 'Strings translations', 'polylang' ) );
22		- register_post_type( 'polylang_mo', array( 'labels' => $labels, 'rewrite' => false, 'query_var' => false, '_pll' => true ) );
23		-
24		- add_action( 'pll_add_language', array( $this, 'clean_cache' ) );
25		- }
26		- }
27		-
28		- /**
29		- * Writes a PLL_MO object into a custom post meta.
30	19	*
31		- * @since 1.2
32		- *
33	20	* @param PLL_Language $lang The language in which we want to export strings.
34	21	* @return void
35	22	*/
36	23	public function export_to_db( $lang ) {
37		- $this->add_entry( $this->make_entry( '', '' ) ); // Empty string translation, just in case
38		-
39	24	/*
40		- * It would be convenient to store the whole object but it would take a huge space in DB.
	25	+ * It would be convenient to store the whole object, but it would take a huge space in DB.
41	26	* So let's keep only the strings in an array.
42		- * The strings are slashed to avoid breaking slashed strings in update_post_meta.
	27	+ * The strings are slashed to avoid breaking slashed strings in update_term_meta.
43	28	* @see https://codex.wordpress.org/Function_Reference/update_post_meta#Character_Escaping.
44	29	*/
45	30	$strings = array();
46	31	foreach ( $this->entries as $entry ) {
47		- $strings[] = wp_slash( array( $entry->singular, $this->translate( $entry->singular ) ) );
	32	+ if ( '' !== $entry->singular ) {
	33	+ $strings[] = wp_slash( array( $entry->singular, $this->translate( $entry->singular ) ) );
	34	+ }
48	35	}
49	36
50		- if ( empty( $lang->mo_id ) ) {
51		- $post = array(
52		- 'post_title' => 'polylang_mo_' . $lang->term_id,
53		- 'post_status' => 'private', // To avoid a conflict with WP Super Cache. See https://wordpress.org/support/topic/polylang_mo-and-404s-take-2
54		- 'post_type' => 'polylang_mo',
55		- );
56		- $mo_id = wp_insert_post( $post );
57		- update_post_meta( $mo_id, '_pll_strings_translations', $strings );
58		- } else {
59		- update_post_meta( $lang->mo_id, '_pll_strings_translations', $strings );
60		- }
	37	+ update_term_meta( $lang->term_id, '_pll_strings_translations', $strings );
61	38	}
62	39
63	40	/**
64		- * Reads a PLL_MO object from a custom post meta.
	41	+ * Reads a PLL_MO object from the term meta.
65	42	*
66	43	* @since 1.2
	44	+ * @since 3.4 Reads a PLL_MO from the term meta.
67	45	*
68	46	* @param PLL_Language $lang The language in which we want to get strings.
69	47	* @return void
70	48	*/
71	49	public function import_from_db( $lang ) {
72		- if ( ! empty( $lang->mo_id ) ) {
73		- $strings = get_post_meta( $lang->mo_id, '_pll_strings_translations', true );
74		- if ( is_array( $strings ) ) {
75		- foreach ( $strings as $msg ) {
76		- $this->add_entry( $this->make_entry( $msg[0], $msg[1] ) );
77		- }
78		- }
	50	+ $this->set_header( 'Language', $lang->slug );
	51	+
	52	+ $strings = get_term_meta( $lang->term_id, '_pll_strings_translations', true );
	53	+ if ( empty( $strings ) || ! is_array( $strings ) ) {
	54	+ return;
79	55	}
80		- }
81	56
82		- /**
83		- * Returns the post id of the post storing the strings translations.
84		- *
85		- * @since 1.4
86		- *
87		- * @param PLL_Language $lang The language object.
88		- * @return int
89		- */
90		- public static function get_id( $lang ) {
91		- global $wpdb;
	57	+ foreach ( $strings as $msg ) {
	58	+ $entry = $this->make_entry( $msg[0], $msg[1] );
92	59
93		- $ids = wp_cache_get( 'polylang_mo_ids' );
94		-
95		- if ( empty( $ids ) ) {
96		- $ids = $wpdb->get_results( "SELECT post_title, ID FROM $wpdb->posts WHERE post_type='polylang_mo'", OBJECT_K );
97		- wp_cache_add( 'polylang_mo_ids', $ids );
	60	+ if ( '' !== $entry->singular ) {
	61	+ $this->add_entry( $entry );
	62	+ }
98	63	}
99		-
100		- // The mo id for a language can be transiently empty
101		- return isset( $ids[ 'polylang_mo_' . $lang->term_id ] ) ? $ids[ 'polylang_mo_' . $lang->term_id ]->ID : null;
102		- }
103		-
104		- /**
105		- * Invalidate the cache when adding a new language
106		- *
107		- * @since 2.0.5
108		- *
109		- * @return void
110		- */
111		- public function clean_cache() {
112		- wp_cache_delete( 'polylang_mo_ids' );
113	64	}
114	65
115	66	/**
116	67	* Deletes a string