add more dpointer placeholders

[apt.git] / apt-pkg / aptconfiguration.cc

diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc
index 429219cbd73d1a4f273506023c78a3165a415354..52f54073cbc0288e582a8ced0f2ccec7cbc15b9d 100644 (file)
--- a/apt-pkg/aptconfiguration.cc
+++ b/apt-pkg/aptconfiguration.cc
@@ -10,6 +10,7 @@
 // Include Files                                                       /*{{{*/
 #include <apt-pkg/aptconfiguration.h>
 #include <apt-pkg/configuration.h>
 // Include Files                                                       /*{{{*/
 #include <apt-pkg/aptconfiguration.h>
 #include <apt-pkg/configuration.h>

+#include <apt-pkg/error.h>

 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/macros.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/macros.h>
 #include <apt-pkg/strutl.h>


@@ -152,6 +153,7 @@ std::vector<std::string> const Configuration::getLanguages(bool const &All,
                        builtin.push_back(c);
                }
        }
                        builtin.push_back(c);
                }
        }

+       closedir(D);

 
        // get the environment language codes: LC_MESSAGES (and later LANGUAGE)
        // we extract both, a long and a short code and then we will
 
        // get the environment language codes: LC_MESSAGES (and later LANGUAGE)
        // we extract both, a long and a short code and then we will


@@ -164,17 +166,6 @@ std::vector<std::string> const Configuration::getLanguages(bool const &All,
        string const envShort = envLong.substr(0,lenShort);
        bool envLongIncluded = true;
 
        string const envShort = envLong.substr(0,lenShort);
        bool envLongIncluded = true;
 

-       // first cornercase: LANG=C, so we use only "en" Translation
-       if (envLong == "C") {
-               codes.push_back("en");
-               allCodes = codes;
-               allCodes.insert(allCodes.end(), builtin.begin(), builtin.end());
-               if (All == true)
-                       return allCodes;
-               else
-                       return codes;
-       }
-

        // to save the servers from unneeded queries, we only try also long codes
        // for languages it is realistic to have a long code translation file…
        // TODO: Improve translation acquire system to drop them dynamic
        // to save the servers from unneeded queries, we only try also long codes
        // for languages it is realistic to have a long code translation file…
        // TODO: Improve translation acquire system to drop them dynamic


@@ -195,6 +186,9 @@ std::vector<std::string> const Configuration::getLanguages(bool const &All,
        // it was undocumented and so it should be not very widthly used
        string const oldAcquire = _config->Find("APT::Acquire::Translation","");
        if (oldAcquire.empty() == false && oldAcquire != "environment") {
        // it was undocumented and so it should be not very widthly used
        string const oldAcquire = _config->Find("APT::Acquire::Translation","");
        if (oldAcquire.empty() == false && oldAcquire != "environment") {

+               // TRANSLATORS: the two %s are APT configuration options
+               _error->Notice("Option '%s' is deprecated. Please use '%s' instead, see 'man 5 apt.conf' for details.",
+                               "APT::Acquire::Translation", "Acquire::Languages");

                if (oldAcquire != "none")
                        codes.push_back(oldAcquire);
                codes.push_back("en");
                if (oldAcquire != "none")
                        codes.push_back(oldAcquire);
                codes.push_back("en");


@@ -212,36 +206,41 @@ std::vector<std::string> const Configuration::getLanguages(bool const &All,
        // It is very likely we will need to environment codes later,
        // so let us generate them now from LC_MESSAGES and LANGUAGE
        std::vector<string> environment;
        // It is very likely we will need to environment codes later,
        // so let us generate them now from LC_MESSAGES and LANGUAGE
        std::vector<string> environment;

-       // take care of LC_MESSAGES
-       if (envLongIncluded == false)
-               environment.push_back(envLong);
-       environment.push_back(envShort);
-       // take care of LANGUAGE
-       string envLang = Locale == 0 ? getenv("LANGUAGE") : *(Locale+1);
-       if (envLang.empty() == false) {
-               std::vector<string> env = ExplodeString(envLang,':');
-               short addedLangs = 0; // add a maximum of 3 fallbacks from the environment
-               for (std::vector<string>::const_iterator e = env.begin();
-                    e != env.end() && addedLangs < 3; ++e) {
-                       if (unlikely(e->empty() == true) || *e == "en")
-                               continue;
-                       if (*e == envLong || *e == envShort)
-                               continue;
-                       if (std::find(environment.begin(), environment.end(), *e) != environment.end())
-                               continue;
-                       if (e->find('_') != string::npos) {
-                               // Drop LongCodes here - ShortCodes are also included
-                               string const shorty = e->substr(0, e->find('_'));
-                               char const **n = needLong;
-                               for (; *n != NULL; ++n)
-                                       if (shorty == *n)
-                                               break;
-                               if (*n == NULL)
+       if (envShort != "C") {
+               // take care of LC_MESSAGES
+               if (envLongIncluded == false)
+                       environment.push_back(envLong);
+               environment.push_back(envShort);
+               // take care of LANGUAGE
+               const char *language_env = getenv("LANGUAGE") == 0 ? "" : getenv("LANGUAGE");
+               string envLang = Locale == 0 ? language_env : *(Locale+1);
+               if (envLang.empty() == false) {
+                       std::vector<string> env = VectorizeString(envLang,':');
+                       short addedLangs = 0; // add a maximum of 3 fallbacks from the environment
+                       for (std::vector<string>::const_iterator e = env.begin();
+                            e != env.end() && addedLangs < 3; ++e) {
+                               if (unlikely(e->empty() == true) || *e == "en")
+                                       continue;
+                               if (*e == envLong || *e == envShort)
+                                       continue;
+                               if (std::find(environment.begin(), environment.end(), *e) != environment.end())

                                        continue;
                                        continue;

+                               if (e->find('_') != string::npos) {
+                                       // Drop LongCodes here - ShortCodes are also included
+                                       string const shorty = e->substr(0, e->find('_'));
+                                       char const **n = needLong;
+                                       for (; *n != NULL; ++n)
+                                               if (shorty == *n)
+                                                       break;
+                                       if (*n == NULL)
+                                               continue;
+                               }
+                               ++addedLangs;
+                               environment.push_back(*e);

                        }
                        }

-                       ++addedLangs;
-                       environment.push_back(*e);

                }
                }

+       } else {
+               environment.push_back("en");

        }
 
        // Support settings like Acquire::Translation=none on the command line to
        }
 
        // Support settings like Acquire::Translation=none on the command line to


@@ -263,6 +262,16 @@ std::vector<std::string> const Configuration::getLanguages(bool const &All,
                        return codes;
        }
 
                        return codes;
        }
 

+       // cornercase: LANG=C, so we use only "en" Translation
+       if (envShort == "C") {
+               allCodes = codes = environment;
+               allCodes.insert(allCodes.end(), builtin.begin(), builtin.end());
+               if (All == true)
+                       return allCodes;
+               else
+                       return codes;
+       }
+

        std::vector<string> const lang = _config->FindVector("Acquire::Languages");
        // the default setting -> "environment, en"
        if (lang.empty() == true) {
        std::vector<string> const lang = _config->FindVector("Acquire::Languages");
        // the default setting -> "environment, en"
        if (lang.empty() == true) {


@@ -325,11 +334,24 @@ std::vector<std::string> const Configuration::getArchitectures(bool const &Cache
        if (likely(Cached == true) && archs.empty() == false)
                return archs;
 
        if (likely(Cached == true) && archs.empty() == false)
                return archs;
 

-       string const arch = _config->Find("APT::Architecture");

        archs = _config->FindVector("APT::Architectures");
        archs = _config->FindVector("APT::Architectures");

+       string const arch = _config->Find("APT::Architecture");
+       if (unlikely(arch.empty() == true))
+               return archs;
+

        if (archs.empty() == true ||
            std::find(archs.begin(), archs.end(), arch) == archs.end())
                archs.push_back(arch);
        if (archs.empty() == true ||
            std::find(archs.begin(), archs.end(), arch) == archs.end())
                archs.push_back(arch);

+
+       // erase duplicates and empty strings
+       for (std::vector<string>::reverse_iterator a = archs.rbegin();
+            a != archs.rend(); ++a) {
+               if (a->empty() == true || std::find(a + 1, archs.rend(), *a) != archs.rend())
+                       archs.erase(a.base()-1);
+               if (a == archs.rend())
+                       break;
+       }
+

        return archs;
 }
                                                                        /*}}}*/
        return archs;
 }
                                                                        /*}}}*/