Ticket #10527: 10527-netbeans.patch

l10n.php

@@ -314 +314 @@
  *
  * @param string $domain Unique identifier for retrieving translated strings
  * @param string $mofile Path to the .mo file
+ * @param bool   $merge  (optional) flag wether or not to merge the .mo file 
+ *                       with an existing textdomain in memory. defaults to 
+ *                       true.
  * @return bool true on success, false on failure
  */
-function load_textdomain($domain, $mofile) {
+function load_textdomain($domain, $mofile, $merge = true) {
         global $l10n;
 
+        if ( isset( $l10n[$domain] ) && false == $merge ) return true;
+        
         if ( !is_readable( $mofile ) ) return false;
 
         $mo = new MO();
         if ( !$mo->import_from_file( $mofile ) ) return false;
 
-        if ( isset( $l10n[$domain] ) )
-                $mo->merge_with( $l10n[$domain] );
+        if ( isset( $l10n[$domain] ) ) $mo->merge_with( $l10n[$domain] );
 
         $l10n[$domain] = &$mo;
         return true;
@@ -351 +355 @@
  * Loads the plugin's translated strings.
  *
  * If the path is not given then it will be the root of the plugin directory.
- * The .mo file should be named based on the domain with a dash, and then the locale exactly.
+ * The .mo file should be named based on the domain with a dash, and then the 
+ * locale exactly.
  *
  * @since 1.5.0
  *
- * @param string $domain Unique identifier for retrieving translated strings
- * @param string $abs_rel_path Optional. Relative path to ABSPATH of a folder,
- *      where the .mo file resides. Deprecated, but still functional until 2.7
- * @param string $plugin_rel_path Optional. Relative path to WP_PLUGIN_DIR. This is the preferred argument to use. It takes precendence over $abs_rel_path
+ * @param string $domain          Name of textdomain
+ * @param string $abs_rel_path    (optional) Relative path to ABSPATH of a folder,
+ *                                            where the .mo file resides. Deprecated, but still 
+ *                                functional until 2.7. 
+ * @param string $plugin_rel_path (optional) Relative path to WP_PLUGIN_DIR. 
+ *                                This is the argument to use instead of $abs_rel_path.
+ * @param bool   $merge           (optional) Flag wether or not to merge the .mo file 
+ *                                with an existing textdomain in memory. default is 
+ *                                false.
+ * @return bool  true on success, false on failure
  */
-function load_plugin_textdomain($domain, $abs_rel_path = false, $plugin_rel_path = false) {
+function load_plugin_textdomain($domain, $abs_rel_path = false, $plugin_rel_path = false, $merge = false) {
         $locale = get_locale();
 
         if ( false !== $plugin_rel_path )
-                $path = WP_PLUGIN_DIR . '/' . trim( $plugin_rel_path, '/');
-        else if ( false !== $abs_rel_path)
+                $path = WP_PLUGIN_DIR . '/' . trim( $plugin_rel_path, '/' );
+        else if ( false !== $abs_rel_path )
                 $path = ABSPATH . trim( $abs_rel_path, '/');
         else
                 $path = WP_PLUGIN_DIR;
 
         $mofile = $path . '/'. $domain . '-' . $locale . '.mo';
-        return load_textdomain($domain, $mofile);
+        return load_textdomain( $domain, $mofile, $merge );
 }
 
 /**