Skip to content

C
core
Kaydet (Commit) 674a7b44 authored tarafından David Tardon's avatar David Tardon
Dosyalara gözat
Seçenekler

install branding images using filelists 

This also reinstates the use of brand_dev/intro.png for non-release
builds, lost with gbuildization of instsetoo_native (commit
1d84e9d1).

Change-Id: I43477505c5c9a3d6ec961d640608e6e91379868e
üst 148c7629
Hide whitespace changes
Inline Side-by-side
Showing with 76 additions and 167 deletions
config_host.mk.in
Dosyayı görüntüle @ 674a7b44
...@@ -12,7 +12,6 @@ gb_SPACE:=$(gb_SPACE) $(gb_SPACE) ...@@ -12,7 +12,6 @@ gb_SPACE:=$(gb_SPACE) $(gb_SPACE)
export SRC_ROOT=@SRC_ROOT@ export SRC_ROOT=@SRC_ROOT@
export BUILDDIR=@BUILDDIR@ export BUILDDIR=@BUILDDIR@
export ABOUT_BACKGROUND_SVG=@ABOUT_BACKGROUND_SVG@
@x_AFLAGS@ export AFLAGS=@AFLAGS@ @x_AFLAGS@ export AFLAGS=@AFLAGS@
export ALLOC=@ALLOC@ export ALLOC=@ALLOC@
export ALL_LANGS=@ALL_LANGS@ export ALL_LANGS=@ALL_LANGS@
...@@ -36,6 +35,7 @@ export BOOST_CXXFLAGS=@BOOST_CXXFLAGS@ ...@@ -36,6 +35,7 @@ export BOOST_CXXFLAGS=@BOOST_CXXFLAGS@
export BOOST_DATE_TIME_LIB=@BOOST_DATE_TIME_LIB@ export BOOST_DATE_TIME_LIB=@BOOST_DATE_TIME_LIB@
export BOOST_LDFLAGS=@BOOST_LDFLAGS@ export BOOST_LDFLAGS=@BOOST_LDFLAGS@
export BOOST_SYSTEM_LIB=@BOOST_SYSTEM_LIB@ export BOOST_SYSTEM_LIB=@BOOST_SYSTEM_LIB@
export BRAND_INTRO_IMAGES=@BRAND_INTRO_IMAGES@
export BSH_JAR=@BSH_JAR@ export BSH_JAR=@BSH_JAR@
export BUILD_PLATFORM=@build@ export BUILD_PLATFORM=@build@
export BUILD_POSTGRESQL_SDBC=@BUILD_POSTGRESQL_SDBC@ export BUILD_POSTGRESQL_SDBC=@BUILD_POSTGRESQL_SDBC@
...@@ -75,6 +75,8 @@ export CROSS_COMPILING=@CROSS_COMPILING@ ...@@ -75,6 +75,8 @@ export CROSS_COMPILING=@CROSS_COMPILING@
export CURL=@CURL@ export CURL=@CURL@
export CURL_CFLAGS=$(gb_SPACE)@CURL_CFLAGS@ export CURL_CFLAGS=$(gb_SPACE)@CURL_CFLAGS@
export CURL_LIBS=$(gb_SPACE)@CURL_LIBS@ export CURL_LIBS=$(gb_SPACE)@CURL_LIBS@
export CUSTOM_BRAND_DIR=@CUSTOM_BRAND_DIR@
export CUSTOM_BRAND_IMAGES=@CUSTOM_BRAND_IMAGES@
export CXX=@CXX@ export CXX=@CXX@
export CXX_FOR_BUILD=@CXX_FOR_BUILD@ export CXX_FOR_BUILD=@CXX_FOR_BUILD@
export CXX_X64_BINARY=@CXX_X64_BINARY@ export CXX_X64_BINARY=@CXX_X64_BINARY@
...@@ -85,6 +87,7 @@ export DBUSMENUGTK_CFLAGS=$(gb_SPACE)@DBUSMENUGTK_CFLAGS@ ...@@ -85,6 +87,7 @@ export DBUSMENUGTK_CFLAGS=$(gb_SPACE)@DBUSMENUGTK_CFLAGS@
export DBUSMENUGTK_LIBS=$(gb_SPACE)@DBUSMENUGTK_LIBS@ export DBUSMENUGTK_LIBS=$(gb_SPACE)@DBUSMENUGTK_LIBS@
export DBUS_CFLAGS=$(gb_SPACE)@DBUS_CFLAGS@ export DBUS_CFLAGS=$(gb_SPACE)@DBUS_CFLAGS@
export DBUS_LIBS=$(gb_SPACE)@DBUS_LIBS@ export DBUS_LIBS=$(gb_SPACE)@DBUS_LIBS@
export DEFAULT_BRAND_IMAGES=@DEFAULT_BRAND_IMAGES@
export DEFAULT_TO_ENGLISH_FOR_PACKING=yes export DEFAULT_TO_ENGLISH_FOR_PACKING=yes
export DEVINSTALLDIR=@DEVINSTALLDIR@ export DEVINSTALLDIR=@DEVINSTALLDIR@
export DIAGRAM_EXTENSION_PACK=@DIAGRAM_EXTENSION_PACK@ export DIAGRAM_EXTENSION_PACK=@DIAGRAM_EXTENSION_PACK@
...@@ -168,7 +171,6 @@ export EPM_FLAGS=@EPM_FLAGS@ ...@@ -168,7 +171,6 @@ export EPM_FLAGS=@EPM_FLAGS@
export EXTERNAL_WARNINGS_NOT_ERRORS=@EXTERNAL_WARNINGS_NOT_ERRORS@ export EXTERNAL_WARNINGS_NOT_ERRORS=@EXTERNAL_WARNINGS_NOT_ERRORS@
export debug=@ENABLE_DEBUG@ export debug=@ENABLE_DEBUG@
@x_Cygwin@ export FIND=@WIN_FIND@ @x_Cygwin@ export FIND=@WIN_FIND@
export FLAT_LOGO_SVG=@FLAT_LOGO_SVG@
export FLEX=@FLEX@ export FLEX=@FLEX@
export FLUTE_JAR=@FLUTE_JAR@ export FLUTE_JAR=@FLUTE_JAR@
export FONTCONFIG_CFLAGS=$(gb_SPACE)@FONTCONFIG_CFLAGS@ export FONTCONFIG_CFLAGS=$(gb_SPACE)@FONTCONFIG_CFLAGS@
...@@ -257,7 +259,6 @@ export INPATH_FOR_BUILD=@INPATH_FOR_BUILD@ ...@@ -257,7 +259,6 @@ export INPATH_FOR_BUILD=@INPATH_FOR_BUILD@
export INSTDIR=@INSTDIR@ export INSTDIR=@INSTDIR@
export INSTALLDIR=@INSTALLDIR@ export INSTALLDIR=@INSTALLDIR@
export INSTALLDIRNAME=@INSTALLDIRNAME@ export INSTALLDIRNAME=@INSTALLDIRNAME@
export INTRO_BITMAP=@INTRO_BITMAP@
export JAVACISGCJ=@JAVACISGCJ@ export JAVACISGCJ=@JAVACISGCJ@
export JAVACISKAFFE=@JAVACISKAFFE@ export JAVACISKAFFE=@JAVACISKAFFE@
export JAVACOMPILER=@JAVACOMPILER@ export JAVACOMPILER=@JAVACOMPILER@
...@@ -456,11 +457,6 @@ export SOLAR_JAVA=@SOLAR_JAVA@ ...@@ -456,11 +457,6 @@ export SOLAR_JAVA=@SOLAR_JAVA@
export SPLIT_APP_MODULES=@SPLIT_APP_MODULES@ export SPLIT_APP_MODULES=@SPLIT_APP_MODULES@
export SPLIT_OPT_FEATURES=@SPLIT_OPT_FEATURES@ export SPLIT_OPT_FEATURES=@SPLIT_OPT_FEATURES@
export SRCDIR=@SRC_ROOT@ export SRCDIR=@SRC_ROOT@
export STARTCENTER_LEFT_BITMAP=@STARTCENTER_LEFT_BITMAP@
export STARTCENTER_RIGHT_BITMAP=@STARTCENTER_RIGHT_BITMAP@
export STARTCENTER_RTL_LEFT_BITMAP=@STARTCENTER_RTL_LEFT_BITMAP@
export STARTCENTER_RTL_RIGHT_BITMAP=@STARTCENTER_RTL_RIGHT_BITMAP@
export STARTCENTER_SPACE_BITMAP=@STARTCENTER_SPACE_BITMAP@
export STRIP=@STRIP@ export STRIP=@STRIP@
export STRIP_COMPONENTS=@STRIP_COMPONENTS@ export STRIP_COMPONENTS=@STRIP_COMPONENTS@
export SUNTEMPLATES_DE_PACK=@SUNTEMPLATES_DE_PACK@ export SUNTEMPLATES_DE_PACK=@SUNTEMPLATES_DE_PACK@
......
configure.ac
Dosyayı görüntüle @ 674a7b44
...@@ -11455,53 +11455,37 @@ dnl branding ...@@ -11455,53 +11455,37 @@ dnl branding
dnl =================================================================== dnl ===================================================================
AC_MSG_CHECKING([for alternative branding images directory]) AC_MSG_CHECKING([for alternative branding images directory])
# initialize mapped arrays # initialize mapped arrays
brand_vars="INTRO_BITMAP ABOUT_BACKGROUND_SVG FLAT_LOGO_SVG \ BRAND_INTRO_IMAGES="flat_logo.svg intro.png"
STARTCENTER_LEFT_BITMAP STARTCENTER_RIGHT_BITMAP \ brand_files="$BRAND_INTRO_IMAGES about.svg \
STARTCENTER_RTL_LEFT_BITMAP STARTCENTER_RTL_RIGHT_BITMAP \
STARTCENTER_SPACE_BITMAP"
brand_files="intro.png about.svg flat_logo.svg \
backing_left.png backing_right.png \ backing_left.png backing_right.png \
backing_rtl_left.png backing_rtl_right.png \ backing_rtl_left.png backing_rtl_right.png \
backing_space.png" backing_space.png"
brandmaxidx=0
for i in $brand_vars
do
declare $i=
let "brandmaxidx=$brandmaxidx + 1"
done
if test -z "$with_branding" -o "$with_branding" = "no"; then if test -z "$with_branding" -o "$with_branding" = "no"; then
AC_MSG_RESULT([none]) AC_MSG_RESULT([none])
DEFAULT_BRAND_IMAGES="$brand_files"
else else
if ! test -d $with_branding ; then if ! test -d $with_branding ; then
AC_MSG_ERROR([No directory $with_branding, falling back to default branding]) AC_MSG_ERROR([No directory $with_branding, falling back to default branding])
else else
AC_MSG_RESULT([$with_branding]) AC_MSG_RESULT([$with_branding])
idx=1 CUSTOM_BRAND_DIR="$with_branding"
while test $idx -le $brandmaxidx for lfile in $brand_files
do do
lvar=$(echo $brand_vars | cut -f$idx -d" ")
lfile=$(echo $brand_files | cut -f$idx -d" ")
if ! test -f $with_branding/$lfile ; then if ! test -f $with_branding/$lfile ; then
AC_MSG_WARN([Branded file $lfile does not exist, using the default one]) AC_MSG_WARN([Branded file $lfile does not exist, using the default one])
DEFAULT_BRAND_IMAGES="$DEFAULT_BRAND_IMAGES $lfile"
else else
declare lvar="$with_branding/$lfile" CUSTOM_BRAND_IMAGES="$CUSTOM_BRAND_IMAGES $lfile"
fi fi
let "idx=$idx + 1"
done done
check_for_progress="yes" check_for_progress="yes"
fi fi
fi fi
AC_SUBST(INTRO_BITMAP) AC_SUBST([BRAND_INTRO_IMAGES])
AC_SUBST(ABOUT_BACKGROUND_SVG) AC_SUBST([CUSTOM_BRAND_DIR])
AC_SUBST(FLAT_LOGO_SVG) AC_SUBST([CUSTOM_BRAND_IMAGES])
AC_SUBST(STARTCENTER_LEFT_BITMAP) AC_SUBST([DEFAULT_BRAND_IMAGES])
AC_SUBST(STARTCENTER_RIGHT_BITMAP)
AC_SUBST(STARTCENTER_RTL_LEFT_BITMAP)
AC_SUBST(STARTCENTER_RTL_RIGHT_BITMAP)
AC_SUBST(STARTCENTER_SPACE_BITMAP)
AC_MSG_CHECKING([for 'intro' progress settings]) AC_MSG_CHECKING([for 'intro' progress settings])
......
desktop/Module_desktop.mk
Dosyayı görüntüle @ 674a7b44
...@@ -19,10 +19,9 @@ $(eval $(call gb_Module_add_targets,desktop,\ ...@@ -19,10 +19,9 @@ $(eval $(call gb_Module_add_targets,desktop,\
Library_offacc \ Library_offacc \
Library_sofficeapp \ Library_sofficeapp \
$(if $(ENABLE_HEADLESS),,Library_spl) \ $(if $(ENABLE_HEADLESS),,Library_spl) \
Package_intro \ Package_branding \
$(if $(CUSTOM_BRAND_DIR),Package_branding_custom) \
UIConfig_deployment \ UIConfig_deployment \
Zip_brand \
Zip_brand_dev \
)) ))
ifeq ($(OS),LINUX) ifeq ($(OS),LINUX)
......
desktop/Package_branding.mk 0 → 100644
Dosyayı görüntüle @ 674a7b44
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# This file is part of the LibreOffice project.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
$(eval $(call gb_Package_Package,desktop_branding,$(SRCDIR)/icon-themes/galaxy))
$(eval $(call gb_Package_set_outdir,desktop_branding,$(INSTDIR)))
$(eval $(call gb_Package_add_files,desktop_branding,program,\
$(foreach image,$(filter $(BRAND_INTRO_IMAGES),$(DEFAULT_BRAND_IMAGES)),\
$(if $(filter intro.png,$(image)),\
$(if $(filter TRUE,$(ENABLE_RELEASE_BUILD)),brand,brand_dev)/$(image),\
brand/$(image) \
) \
) \
))
$(eval $(call gb_Package_add_files,desktop_branding,program/shell,\
$(addprefix brand/shell/,$(filter-out $(BRAND_INTRO_IMAGES),$(DEFAULT_BRAND_IMAGES))) \
))
# vim: set noet sw=4 ts=4:
desktop/Package_intro.mk → desktop/Package_branding_custom.mk
Dosyayı görüntüle @ 674a7b44
...@@ -7,11 +7,16 @@ ...@@ -7,11 +7,16 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
# #
# The patsubst is used to remove the trailing '/' dir produces. $(eval $(call gb_Package_Package,desktop_branding_custom,$(CUSTOM_BRAND_DIR)))
# Otherwise the package tries to depend on zip target brand//intro,
# which is unfortunately different from brand/intro...
$(eval $(call gb_Package_Package,desktop_intro,$(patsubst %/,%,$(dir $(call gb_Zip_get_target,brand/intro)))))
$(eval $(call gb_Package_add_file,desktop_intro,pck/intro.zip,intro.zip)) $(eval $(call gb_Package_set_outdir,desktop_branding_custom,$(INSTDIR)))
# vim: set ts=4 sw=4 et: $(eval $(call gb_Package_add_files,desktop_branding_custom,program,\
$(filter $(BRAND_INTRO_IMAGES),$(CUSTOM_BRAND_IMAGES)) \
))
$(eval $(call gb_Package_add_files,desktop_branding_custom,program/shell,\
$(filter-out $(BRAND_INTRO_IMAGES),$(CUSTOM_BRAND_IMAGES)) \
))
# vim: set noet sw=4 ts=4:
desktop/Zip_brand.mk deleted 100644 → 0
Dosyayı görüntüle @ 148c7629
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# This file is part of the LibreOffice project.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
$(eval $(call gb_Zip_Zip,brand/intro,$(WORKDIR)/Zip/brand_intro))
$(eval $(call gb_Zip_add_file,brand/intro,shell/about.svg,\
$(if $(ABOUT_BACKGROUND_SVG),\
$(ABOUT_BACKGROUND_SVG),\
$(SRCDIR)/icon-themes/galaxy/brand/shell/about.svg)\
))
$(eval $(call gb_Zip_add_file,brand/intro,flat_logo.svg,\
$(if $(FLAT_LOGO_SVG),\
$(FLAT_LOGO_SVG),\
$(SRCDIR)/icon-themes/galaxy/brand/flat_logo.svg)\
))
$(eval $(call gb_Zip_add_file,brand/intro,intro.png,\
$(if $(INTRO_BITMAP),\
$(INTRO_BITMAP),\
$(SRCDIR)/icon-themes/galaxy/brand/intro.png)\
))
$(eval $(call gb_Zip_add_file,brand/intro,shell/backing_left.png,\
$(if $(STARTCENTER_LEFT_BITMAP),\
$(STARTCENTER_LEFT_BITMAP),\
$(SRCDIR)/icon-themes/galaxy/brand/shell/backing_left.png)\
))
$(eval $(call gb_Zip_add_file,brand/intro,shell/backing_right.png,\
$(if $(STARTCENTER_RIGHT_BITMAP),\
$(STARTCENTER_RIGHT_BITMAP),\
$(SRCDIR)/icon-themes/galaxy/brand/shell/backing_right.png)\
))
$(eval $(call gb_Zip_add_file,brand/intro,shell/backing_space.png,\
$(if $(STARTCENTER_SPACE_BITMAP),\
$(STARTCENTER_SPACE_BITMAP),\
$(SRCDIR)/icon-themes/galaxy/brand/shell/backing_space.png)\
))
$(eval $(call gb_Zip_add_file,brand/intro,shell/backing_rtl_left.png,\
$(if $(STARTCENTER_RTL_LEFT_BITMAP),\
$(STARTCENTER_RTL_LEFT_BITMAP),\
$(SRCDIR)/icon-themes/galaxy/brand/shell/backing_rtl_left.png)\
))
$(eval $(call gb_Zip_add_file,brand/intro,shell/backing_rtl_right.png,\
$(if $(STARTCENTER_RTL_RIGHT_BITMAP),\
$(STARTCENTER_RTL_RIGHT_BITMAP),\
$(SRCDIR)/icon-themes/galaxy/brand/shell/backing_rtl_right.png)\
))
# vim: set ts=4 sw=4 et:
desktop/Zip_brand_dev.mk deleted 100644 → 0
Dosyayı görüntüle @ 148c7629
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# This file is part of the LibreOffice project.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
$(eval $(call gb_Zip_Zip,brand_dev/intro,$(WORKDIR)/Zip/brand_intro_dev))
$(eval $(call gb_Zip_add_file,brand_dev/intro,shell/about.svg,\
$(if $(ABOUT_BACKGROUND_SVG),\
$(ABOUT_BACKGROUND_SVG),\
$(SRCDIR)/icon-themes/galaxy/brand/shell/about.svg)\
))
$(eval $(call gb_Zip_add_file,brand_dev/intro,flat_logo.svg,\
$(if $(FLAT_LOGO_SVG),\
$(FLAT_LOGO_SVG),\
$(SRCDIR)/icon-themes/galaxy/brand/flat_logo.svg)\
))
$(eval $(call gb_Zip_add_file,brand_dev/intro,intro.png,\
$(if $(INTRO_BITMAP),\
$(INTRO_BITMAP),\
$(SRCDIR)/icon-themes/galaxy/brand_dev/intro.png)\
))
$(eval $(call gb_Zip_add_file,brand_dev/intro,shell/backing_left.png,\
$(if $(STARTCENTER_LEFT_BITMAP),\
$(STARTCENTER_LEFT_BITMAP),\
$(SRCDIR)/icon-themes/galaxy/brand/shell/backing_left.png)\
))
$(eval $(call gb_Zip_add_file,brand_dev/intro,shell/backing_right.png,\
$(if $(STARTCENTER_RIGHT_BITMAP),\
$(STARTCENTER_RIGHT_BITMAP),\
$(SRCDIR)/icon-themes/galaxy/brand/shell/backing_right.png)\
))
$(eval $(call gb_Zip_add_file,brand_dev/intro,shell/backing_space.png,\
$(if $(STARTCENTER_SPACE_BITMAP),\
$(STARTCENTER_SPACE_BITMAP),\
$(SRCDIR)/icon-themes/galaxy/brand/shell/backing_space.png)\
))
$(eval $(call gb_Zip_add_file,brand_dev/intro,shell/backing_rtl_left.png,\
$(if $(STARTCENTER_RTL_LEFT_BITMAP),\
$(STARTCENTER_RTL_LEFT_BITMAP),\
$(SRCDIR)/icon-themes/galaxy/brand/shell/backing_rtl_left.png)\
))
$(eval $(call gb_Zip_add_file,brand_dev/intro,shell/backing_rtl_right.png,\
$(if $(STARTCENTER_RTL_RIGHT_BITMAP),\
$(STARTCENTER_RTL_RIGHT_BITMAP),\
$(SRCDIR)/icon-themes/galaxy/brand/shell/backing_rtl_right.png)\
))
# vim: set ts=4 sw=4 et:
scp2/InstallModule_ooo.mk
Dosyayı görüntüle @ 674a7b44
...@@ -79,6 +79,7 @@ $(eval $(call gb_InstallModule_define_value_if_set,scp2/ooo,\ ...@@ -79,6 +79,7 @@ $(eval $(call gb_InstallModule_define_value_if_set,scp2/ooo,\
)) ))
$(eval $(call gb_InstallModule_add_defs,scp2/ooo,\ $(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
$(if $(CUSTOM_BRAND_DIR),-DCUSTOM_BRANDING) \
$(if $(WINDOWS_SDK_HOME),\ $(if $(WINDOWS_SDK_HOME),\
-DHAVE_WINDOWS_SDK \ -DHAVE_WINDOWS_SDK \
) \ ) \
......
scp2/source/ooo/common_brand.scp
Dosyayı görüntüle @ 674a7b44
...@@ -60,6 +60,7 @@ Module gid_Module_Root_Brand ...@@ -60,6 +60,7 @@ Module gid_Module_Root_Brand
gid_Brand_File_Bin_Unopkg, gid_Brand_File_Bin_Unopkg,
gid_Brand_File_Bin_Libxml2, gid_Brand_File_Bin_Libxml2,
gid_Brand_File_Bmp_IntroAboutShell, gid_Brand_File_Bmp_IntroAboutShell,
gid_Brand_File_Bmp_IntroAboutShell_custom,
gid_Brand_File_Html_Thirdpartylicensereadme, gid_Brand_File_Html_Thirdpartylicensereadme,
gid_Brand_File_Lib_Dbghelp, gid_Brand_File_Lib_Dbghelp,
gid_Brand_File_Lib_Mingw_GccS, gid_Brand_File_Lib_Mingw_GccS,
...@@ -613,9 +614,25 @@ End ...@@ -613,9 +614,25 @@ End
File gid_Brand_File_Bmp_IntroAboutShell File gid_Brand_File_Bmp_IntroAboutShell
TXT_FILE_BODY; TXT_FILE_BODY;
Dir = gid_Brand_Dir_Program; Dir = FILELIST_DIR;
Name = "intro.zip"; Name = "desktop_branding.filelist";
Styles = (ARCHIVE); Styles = (FILELIST);
End
#if defined CUSTOM_BRANDING
File gid_Brand_File_Bmp_IntroAboutShell_custom
TXT_FILE_BODY;
Dir = FILELIST_DIR;
Name = "desktop_branding_custom.filelist";
Styles = (FILELIST);
End
#endif
File gid_Brand_File_Images_Brand_Zip
TXT_FILE_BODY;
Dir = gid_Brand_Dir_Share_Config;
Name = "images_brand.zip";
Styles = (PACKED);
End End
File gid_Brand_File_Txt_Package File gid_Brand_File_Txt_Package
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment