[Mac] Localize app shims with the OS preferred language.

chrome/browser/web_applications/web_app_mac.mm

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/web_applications/web_app_mac.h"
 
 #import <Carbon/Carbon.h>
 #import <Cocoa/Cocoa.h>
 
 #include "base/command_line.h"
@@ skipping 682 matching lines @@
     return 0;
 
   for (std::vector<base::FilePath>::const_iterator it = folders.begin();
        it != folders.end(); ++it) {
     const base::FilePath& dst_path = *it;
     if (!base::CreateDirectory(dst_path)) {
       LOG(ERROR) << "Creating directory " << dst_path.value() << " failed.";
       return succeeded;
     }
 
+    // Ensure the copy does not merge with stale info.
+    base::DeleteFile(dst_path.Append(app_name), true);
+
     if (!base::CopyDirectory(staging_path, dst_path, true)) {
       LOG(ERROR) << "Copying app to dst path: " << dst_path.value()
                  << " failed";
       return succeeded;
     }
 
     // Remove the quarantine attribute from both the bundle and the executable.
     base::mac::RemoveQuarantineAttribute(dst_path.Append(app_name));
     base::mac::RemoveQuarantineAttribute(
         dst_path.Append(app_name)
@@ skipping 78 matching lines @@
   base::FilePath bundle_path = GetAppBundleById(GetBundleIdentifier());
   if (!bundle_path.empty() && HasSameUserDataDir(bundle_path))
     base::DeleteFile(bundle_path, true);
 
   // Delete the internal one.
   DeletePathAndParentIfEmpty(GetInternalShortcutPath());
 }
 
 bool WebAppShortcutCreator::UpdateShortcuts() {
   std::vector<base::FilePath> paths;
-  base::DeleteFile(GetInternalShortcutPath(), true);
   paths.push_back(app_data_dir_);
 
   // Try to update the copy under /Applications. If that does not exist, check
   // if a matching bundle can be found elsewhere.
   base::FilePath app_path = GetApplicationsShortcutPath();
   if (app_path.empty() || !base::PathExists(app_path))
     app_path = GetAppBundleById(GetBundleIdentifier());
 
-  if (!app_path.empty()) {
-    base::DeleteFile(app_path, true);
+  if (!app_path.empty())
     paths.push_back(app_path.DirName());
-  }
 
   size_t success_count = CreateShortcutsIn(paths);
   if (success_count == 0)
     return false;
 
   UpdateInternalBundleIdentifier();
   return success_count == paths.size() && !app_path.empty();
 }
 
 base::FilePath WebAppShortcutCreator::GetApplicationsDirname() const {
@@ skipping 66 matching lines @@
           switches::kEnableAppsFileAssociations)) {
     UpdateFileTypes(plist, file_handlers_info_);
   }
 
   return [plist writeToFile:plist_path
                  atomically:YES];
 }
 
 bool WebAppShortcutCreator::UpdateDisplayName(
     const base::FilePath& app_path) const {
-  // OSX searches for the best language in the order of preferred languages.
-  // Since we only have one localization directory, it will choose this one.
-  base::FilePath localized_dir = GetResourcesPath(app_path).Append("en.lproj");
+  // Localization is used to display the app name (rather than the bundle
+  // filename). OSX searches for the best language in the order of preferred
+  // languages, but one of them must be found otherwise it will default to
+  // the filename.
+  NSString* language = [[NSLocale preferredLanguages] objectAtIndex:0];
+  base::FilePath localized_dir = GetResourcesPath(app_path).Append(
+      base::SysNSStringToUTF8(language) + ".lproj");
   if (!base::CreateDirectory(localized_dir))
     return false;
 
   NSString* bundle_name = base::SysUTF16ToNSString(info_->title);
   NSString* display_name = base::SysUTF16ToNSString(info_->title);
   if (HasExistingExtensionShim(GetApplicationsDirname(), info_->extension_id,
                                app_path.BaseName())) {
     display_name = [bundle_name
         stringByAppendingString:base::SysUTF8ToNSString(
             " (" + info_->profile_name + ")")];
@@ skipping 295 matching lines @@
   web_app::GetShortcutInfoForApp(
       app,
       profile,
       base::Bind(&web_app::CreateAppShortcutInfoLoaded,
                  profile,
                  app,
                  close_callback));
 }
 
 }  // namespace chrome