From ad1cf1f1999e4605efc6690f27dfccf2ab1b0c50 Mon Sep 17 00:00:00 2001
From: Justin Martin <frozenfire@php.net>
Date: Mon, 5 Dec 2011 21:35:52 +0000
Subject: [PATCH] Fixed and clarified both the procedural and OOP variants, and
 updated examples. Addresses bug #53995.

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@320463 c90b9560-bf6c-de11-be94-00142212c4b1
---
 reference/intl/resourcebundle/locales.xml | 32 ++++++++++++++---------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/reference/intl/resourcebundle/locales.xml b/reference/intl/resourcebundle/locales.xml
index 7c7bb2f169..32fc564266 100644
--- a/reference/intl/resourcebundle/locales.xml
+++ b/reference/intl/resourcebundle/locales.xml
@@ -15,7 +15,7 @@
   <methodsynopsis>
    <type>array</type>
    <methodname>ResourceBundle::getLocales</methodname>
-   <void />
+   <methodparam><type>string</type><parameter>bundlename</parameter></methodparam>
   </methodsynopsis>
   <para>
    Procedural style
@@ -23,13 +23,10 @@
   <methodsynopsis>
    <type>array</type>
    <methodname>resourcebundle_locales</methodname>
-   <methodparam><type>ResourceBundle</type><parameter>r</parameter></methodparam>
+   <methodparam><type>string</type><parameter>bundlename</parameter></methodparam>
   </methodsynopsis>
   <para>
-   Get the list of locales supported by the bundle. The list is taken from the bundle table 
-   named <code>res_index</code> which should contain a table named <code>InstalledLocales</code>,
-   which contains locales as keys. This bundle should be either in data directory as .res file or
-   part of the .dat file for this function to work.
+   Get available locales from ResourceBundle name.
    </para>
  </refsect1>
 
@@ -38,10 +35,11 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>r</parameter></term>
+     <term><parameter>bundlename</parameter></term>
      <listitem>
       <para>
-       <classname>ResourceBundle</classname> object.
+       Path of ResourceBundle for which to get available locales, or
+       empty string for default locales list.
       </para>
      </listitem>
     </varlistentry>
@@ -64,23 +62,31 @@
    <programlisting role="php">
 <![CDATA[
 <?php
-$r = resourcebundle_create( 'es', "/usr/share/data/myapp");
-echo join("\n", resourcebundle_locales($r));
+$bundle = "/user/share/data/myapp";
+echo join(PHP_EOL, resourcebundle_locales($bundle);
 ?>
 ]]>
    </programlisting>
+   &example.outputs.similar;
+   <screen>
+<![CDATA[
+es
+root
+]]>
+   </screen>
   </example>
   <example>
    <title>OO example</title>
    <programlisting role="php">
 <![CDATA[
 <?php
-$r = new ResourceBundle( 'es', "/usr/share/data/myapp");
-echo join("\n", $r->getLocales());
+$bundle = "/usr/share/data/myapp";
+$r = new ResourceBundle( 'es', $bundle);
+echo join("\n", $r->getLocales($bundle));
 ?>
 ]]>
    </programlisting>
-  &example.outputs;
+  &example.outputs.similar;
   <screen>
 <![CDATA[
 es