Merge branch 'master' into simon/frontend-packages-29-12
This commit is contained in:
		
						commit
						7e42d2d792
					
				@ -137,6 +137,10 @@
 | 
			
		||||
          "hi": {
 | 
			
		||||
            "translation": "src/locale/messages.hi.xlf",
 | 
			
		||||
            "baseHref": "/hi/"
 | 
			
		||||
          },
 | 
			
		||||
          "lt": {
 | 
			
		||||
            "translation": "src/locale/messages.lt.xlf",
 | 
			
		||||
            "baseHref": "/lt/"
 | 
			
		||||
          }
 | 
			
		||||
        }
 | 
			
		||||
      },
 | 
			
		||||
 | 
			
		||||
@ -120,7 +120,7 @@ export const languages: Language[] = [
 | 
			
		||||
   { code: 'he', name: 'עברית' },           // Hebrew
 | 
			
		||||
   { code: 'ka', name: 'ქართული' },         // Georgian
 | 
			
		||||
// { code: 'lv', name: 'Latviešu' },        // Latvian
 | 
			
		||||
// { code: 'lt', name: 'Lietuvių' },        // Lithuanian
 | 
			
		||||
   { code: 'lt', name: 'Lietuvių' },        // Lithuanian
 | 
			
		||||
   { code: 'hu', name: 'Magyar' },          // Hungarian
 | 
			
		||||
   { code: 'mk', name: 'Македонски' },      // Macedonian
 | 
			
		||||
// { code: 'ms', name: 'Bahasa Melayu' },   // Malay
 | 
			
		||||
 | 
			
		||||
@ -106,6 +106,7 @@ http {
 | 
			
		||||
	        ~*^vi vi;
 | 
			
		||||
	        ~*^zh zh;
 | 
			
		||||
	        ~*^hi hi;
 | 
			
		||||
	        ~*^lt lt;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	map $cookie_lang $lang {
 | 
			
		||||
@ -141,6 +142,7 @@ http {
 | 
			
		||||
	        ~*^vi vi;
 | 
			
		||||
	        ~*^zh zh;
 | 
			
		||||
	        ~*^hi hi;
 | 
			
		||||
	        ~*^lt lt;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	server {
 | 
			
		||||
 | 
			
		||||
@ -31,6 +31,7 @@ map $http_accept_language $header_lang {
 | 
			
		||||
	~*^uk uk;
 | 
			
		||||
	~*^vi vi;
 | 
			
		||||
	~*^zh zh;
 | 
			
		||||
	~*^lt lt;
 | 
			
		||||
}
 | 
			
		||||
map $cookie_lang $lang {
 | 
			
		||||
	default $header_lang;
 | 
			
		||||
@ -65,4 +66,5 @@ map $cookie_lang $lang {
 | 
			
		||||
	~*^uk uk;
 | 
			
		||||
	~*^vi vi;
 | 
			
		||||
	~*^zh zh;
 | 
			
		||||
	~*^lt lt;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user