From: Tomasz Iwanek <t.iwanek@samsung.com>
Date: Wed, 27 Mar 2013 09:09:29 +0000 (+0100)
Subject: Revert "app:// to widget:// scheme for localization"
X-Git-Tag: 2.2.1_release~9^2~138
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3e94f47d6680309a51d569ea8d89b248cf2d0303;p=framework%2Fweb%2Fwrt-commons.git

Revert "app:// to widget:// scheme for localization"

[Issue#]       N/A
[Bug/Feature]  Revert
[Cause]        Revert
[Solution]     Revert
[Verification] Build.

This reverts commit 03a445aa9d60d65135b403343548cb666a323fe9.
---

diff --git a/modules/localization/src/w3c_file_localization.cpp b/modules/localization/src/w3c_file_localization.cpp
index d07227a..4bea51f 100644
--- a/modules/localization/src/w3c_file_localization.cpp
+++ b/modules/localization/src/w3c_file_localization.cpp
@@ -41,6 +41,7 @@ using namespace WrtDB;
 namespace {
 const DPL::String FILE_URI_BEGIN = L"file://";
 const DPL::String WIDGET_URI_BEGIN = L"widget://";
+const DPL::String APP_URI_BEGIN = L"app://";
 const DPL::String LOCALE_PREFIX = L"locales/";
 
 DPL::Optional<std::string> GetFilePathInWidgetPackageInternal(
@@ -140,7 +141,9 @@ DPL::Optional<DPL::String> getFilePathInWidgetPackageFromUrl(
 {
     DPL::String req = url;
 
-    if (req.find(FILE_URI_BEGIN) == 0) {
+    if (req.find(WIDGET_URI_BEGIN) == 0) {
+        req.erase(0, WIDGET_URI_BEGIN.length());
+    } else if (req.find(FILE_URI_BEGIN) == 0) {
         req.erase(0, FILE_URI_BEGIN.length());
         if (req.find(dao->getPath()) == 0) {
             req.erase(0, dao->getPath().length());
@@ -154,8 +157,8 @@ DPL::Optional<DPL::String> getFilePathInWidgetPackageFromUrl(
                 req.erase(0, position + 1);
             }
         }
-    } else if(req.find(WIDGET_URI_BEGIN) == 0) {
-        req.erase(0, WIDGET_URI_BEGIN.length());
+    } else if(req.find(APP_URI_BEGIN) == 0) {
+        req.erase(0, APP_URI_BEGIN.length());
         DPL::String id = *dao->getTizenAppId();
         if(req.substr(0, id.size()) != id)
         {