Changeset 504

Timestamp:

06/07/2010 08:44:50 AM (16 years ago)

Author:

nbachiyski

Message:

Move more general project URL matches to the bottom, because if the slug of a translation set is a valid locale they catch more specific URLs like export-translations

File:

• trunk/gp-includes/routes.php (modified) (1 diff)

trunk/gp-includes/routes.php

@@ -73 +73 @@
 
                         "post:/$project/$locale/$dir/-bulk" => array('GP_Route_Translation', 'bulk_post'),
-                        "get:/$project/$locale/$dir" => array('GP_Route_Translation', 'translations_get'),
-                        "post:/$project/$locale/$dir" => array('GP_Route_Translation', 'translations_post'),
                         "get:/$project/$locale/$dir/import-translations" => array('GP_Route_Translation', 'import_translations_get'),
                         "post:/$project/$locale/$dir/import-translations" => array('GP_Route_Translation', 'import_translations_post'),
                         "post:/$project/$locale/$dir/-discard-warning" => array('GP_Route_Translation', 'discard_warning'),
                         "/$project/$locale/$dir/export-translations" => array('GP_Route_Translation', 'export_translations_get'),
-                        // keep this one at the bottom of the project, because it will catch anything starting with project
+                        // keep this below all URLs ending with a literal string, because it may catch one of them
+                        "get:/$project/$locale/$dir" => array('GP_Route_Translation', 'translations_get'),
+                        "post:/$project/$locale/$dir" => array('GP_Route_Translation', 'translations_post'),
+                        // keep this one at the bottom of the project, because it will catch anything starting with project                     
                         "/$project" => array('GP_Route_Project', 'single'),