From b195d44cbfd884fbf2767844d20940d5d6467f34 Mon Sep 17 00:00:00 2001
From: nathangray <nathangray.bsc+github@gmail.com>
Date: Mon, 11 Jul 2016 16:23:58 -0600
Subject: [PATCH] Fix common and admin translations were sometimes missing

---
 api/src/Translation.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/api/src/Translation.php b/api/src/Translation.php
index 87696977e8..c7f9827114 100644
--- a/api/src/Translation.php
+++ b/api/src/Translation.php
@@ -608,6 +608,11 @@ class Translation
 						self::$load_via[$l_app][] = $app_dir;
 						$updated_load_via = true;
 					}
+					else if ($l_app != $app_dir &&
+						array_intersect((array)self::$load_via[$l_app], array('all-apps', $app_dir)))
+					{
+						$loaded[$l_id] = $l_translation;
+					}
 					continue;
 				}
 				$loaded[$l_id] = $l_translation;