Changeset 1873

Timestamp:

09/11/2015 07:21:33 AM (9 years ago)

Author:

dd32

Message:

Translate: On the Waiting tab, display the full project hierarchy of names. Since there's no context as to what the parent is, a Plugins project would simply display 'Development (trunk)' instead of (for example) 'Beta Tester - Development (trunk)'.

Location:

sites/trunk/translate.wordpress.org

Files:

• includes/gp-plugins/wporg-log-warnings-to-slack.php (modified) (1 diff)
• public_html/gp-templates/locale-projects.php (modified) (2 diffs)

sites/trunk/translate.wordpress.org/includes/gp-plugins/wporg-log-warnings-to-slack.php

@@ -91 +91 @@
         $project = GP::$project->get( $original->project_id );
 
-        $project_name = $project->name;
-        do {
-            $parent_project = GP::$project->get( $project->parent_project_id );
-            $project_name = $parent_project->name . ' - ' . $project_name;
-        } while ( $parent_project && $parent_project->parent_project_id );
+        $project_name = $sub_project->name;
+        $parent_project_id = $project->parent_project_id;
+        while ( $parent_project_id ) {
+            $parent_project = GP::$project->get( $parent_project_id );
+            $parent_project_id = $parent_project->parent_project_id;
+            $project_name = "{$parent_project->name} - {$project_name}";
+        }
 
         $project_url = gp_url_join( gp_url_public_root(), 'projects', $project->path, $set->locale, '/', $set->slug ) . '?filters[warnings]=yes&sort[by]=translation_date_added';

sites/trunk/translate.wordpress.org/public_html/gp-templates/locale-projects.php

@@ -90 +90 @@
         if ( 'waiting' == $project->slug ) {
             $project_url = gp_url_join( '/projects', $sub_project->path, $locale_slug, $set_slug ) . '?filters[status]=waiting&filters[status]=fuzzy';
+
+            $project_name = $sub_project->name;
+            $parent_project_id = $sub_project->parent_project_id;
+            while ( $parent_project_id ) {
+                $parent_project = GP::$project->get( $parent_project_id );
+                $parent_project_id = $parent_project->parent_project_id;
+                $project_name = "{$parent_project->name} - {$project_name}";
+            }
+
         } else {
             $project_url = gp_url_join( '/locale', $locale_slug, $set_slug, $sub_project->path );
+            $project_name = $sub_project->name;
         }
 
@@ -111 +121 @@
                 <div class="project-name">
                     <h4>
-                        <?php echo gp_link_get( $project_url, $sub_project->name ) ?>
+                        <?php echo gp_link_get( $project_url, $project_name ) ?>
                     </h4>
                 </div>