Merge branch 'main' into add-gur-shi-tfng-languages

codemagic-ci-cd · Jun 9, 2023 · 11e4eff · 11e4eff
2 parents 9f57a41 + c5c1ea1
commit 11e4eff
Show file tree

Hide file tree

Showing 20 changed files with 2 additions and 3 deletions.
diff --git a/Wikipedia/Code/DescriptionEditViewController.storyboard b/Wikipedia/Code/DescriptionEditViewController.storyboard
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="a7r-jI-djU">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="a7r-jI-djU">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21678"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>

diff --git a/Wikipedia/Code/DescriptionEditViewController.swift b/Wikipedia/Code/DescriptionEditViewController.swift
@@ -329,7 +329,6 @@ protocol DescriptionEditViewControllerDelegate: AnyObject {
     }
 
     private func hideAllWarningLabels() {
-        warningCharacterCountLabel.isHidden = true
         lengthWarningLabel.isHidden = true
         casingWarningLabel.isHidden = true
     }

diff --git a/Wikipedia/iOS Native Localizations/ckb.lproj/Localizable.strings b/Wikipedia/iOS Native Localizations/ckb.lproj/Localizable.strings
diff --git a/Wikipedia/iOS Native Localizations/cs.lproj/Localizable.strings b/Wikipedia/iOS Native Localizations/cs.lproj/Localizable.strings
diff --git a/Wikipedia/iOS Native Localizations/da.lproj/Localizable.strings b/Wikipedia/iOS Native Localizations/da.lproj/Localizable.strings
diff --git a/Wikipedia/iOS Native Localizations/de.lproj/Localizable.strings b/Wikipedia/iOS Native Localizations/de.lproj/Localizable.strings
diff --git a/Wikipedia/iOS Native Localizations/eu.lproj/Localizable.strings b/Wikipedia/iOS Native Localizations/eu.lproj/Localizable.strings
diff --git a/Wikipedia/iOS Native Localizations/fa.lproj/Localizable.strings b/Wikipedia/iOS Native Localizations/fa.lproj/Localizable.strings
diff --git a/Wikipedia/iOS Native Localizations/ga.lproj/Localizable.strings b/Wikipedia/iOS Native Localizations/ga.lproj/Localizable.strings
diff --git a/Wikipedia/iOS Native Localizations/hr.lproj/Localizable.strings b/Wikipedia/iOS Native Localizations/hr.lproj/Localizable.strings
diff --git a/Wikipedia/iOS Native Localizations/hsb.lproj/Localizable.strings b/Wikipedia/iOS Native Localizations/hsb.lproj/Localizable.strings
diff --git a/Wikipedia/iOS Native Localizations/it.lproj/Localizable.strings b/Wikipedia/iOS Native Localizations/it.lproj/Localizable.strings
diff --git a/Wikipedia/iOS Native Localizations/jv.lproj/Localizable.strings b/Wikipedia/iOS Native Localizations/jv.lproj/Localizable.strings
diff --git a/Wikipedia/iOS Native Localizations/ne.lproj/Localizable.strings b/Wikipedia/iOS Native Localizations/ne.lproj/Localizable.strings
diff --git a/Wikipedia/iOS Native Localizations/pt-br.lproj/Localizable.strings b/Wikipedia/iOS Native Localizations/pt-br.lproj/Localizable.strings
diff --git a/Wikipedia/iOS Native Localizations/sl.lproj/Localizable.strings b/Wikipedia/iOS Native Localizations/sl.lproj/Localizable.strings
diff --git a/Wikipedia/iOS Native Localizations/sr-EC.lproj/Localizable.strings b/Wikipedia/iOS Native Localizations/sr-EC.lproj/Localizable.strings
diff --git a/Wikipedia/iOS Native Localizations/sr-el.lproj/Localizable.strings b/Wikipedia/iOS Native Localizations/sr-el.lproj/Localizable.strings
diff --git a/Wikipedia/iOS Native Localizations/te.lproj/Localizable.strings b/Wikipedia/iOS Native Localizations/te.lproj/Localizable.strings
diff --git a/Wikipedia/iOS Native Localizations/th.lproj/Localizable.strings b/Wikipedia/iOS Native Localizations/th.lproj/Localizable.strings